From 11cd31cdee06f41e5816b019de882f7bdd7e4b45 Mon Sep 17 00:00:00 2001
From: Wojciech Todryk <wojciech@todryk.pl>
Date: Sun, 8 Jul 2012 14:18:19 +0200
Subject: [PATCH] fixes in draft folder

---
 CHANGES.markdown                           | 4 ++++
 app/controllers/messages_ops_controller.rb | 7 +++++--
 app/views/messages/_header.html.haml       | 4 ++--
 config/settings.yml.example                | 2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/CHANGES.markdown b/CHANGES.markdown
index bbc65ff..0681809 100755
--- a/CHANGES.markdown
+++ b/CHANGES.markdown
@@ -1,5 +1,9 @@
 ## Changes
 
+#### 0.9.2
+	
+  * fixes in handling draft folder
+
 #### 0.9.1
 
   * nowrap to edit column in contacts & links
diff --git a/app/controllers/messages_ops_controller.rb b/app/controllers/messages_ops_controller.rb
index 656ae58..d0f2fee 100755
--- a/app/controllers/messages_ops_controller.rb
+++ b/app/controllers/messages_ops_controller.rb
@@ -250,7 +250,7 @@ class MessagesOpsController < ApplicationController
             flash[:error] = t(:general_error,:scope=>:internal) + " (" + e.class.name + " " + e.to_s + ")"
         else
             @attachments.each do |filename|
-                path = File.join(Rails.root,filename)
+                path = File.join(Rails.root,filename[:name])
                 File.delete(path) if File.exist?(path)
             end
             flash[:success] = t(:was_saved,:scope => :compose)
@@ -260,7 +260,10 @@ class MessagesOpsController < ApplicationController
 
     #FIXME edit does not support attachments
     def edit
-		old_message = @current_user.messages.where('folder_id = ? and uid = ?',@current_folder,params[:uids].first).first
+    #logger.info @current_folder.inspect
+    #logger.info params.inspect
+    
+		old_message = @current_user.messages.where('folder_id = ? and uid = ?',@current_folder,params[:id]).first
         @message = Message.new
         @message.to_addr = old_message.to_addr
         @message.subject = old_message.subject
diff --git a/app/views/messages/_header.html.haml b/app/views/messages/_header.html.haml
index a557f55..3d59248 100755
--- a/app/views/messages/_header.html.haml
+++ b/app/views/messages/_header.html.haml
@@ -15,13 +15,13 @@
 				%td{:class=>"field_name"}
 					= humanize_attr(@message,'cc_addr') + ':'
 				%td
-					= @cc.join('; ')
+					= address_formatter(@cc,:show)
 		- if not @bcc.nil?
 			%tr
 				%td{:class=>"field_name"}
 					= humanize_attr(@message,'bcc_addr') + ':'
 				%td
-					= @bcc.join('; ')
+					= address_formatter(@bcc,:show)
 		%tr
 			%td{:class=>"field_name"}
 				= humanize_attr(@message,'subject') + ':'
diff --git a/config/settings.yml.example b/config/settings.yml.example
index 695a011..b7dec7b 100755
--- a/config/settings.yml.example
+++ b/config/settings.yml.example
@@ -1,4 +1,4 @@
-version: 0.9.1
+version: 0.9.2
 
 theme: olive
 locale: pl