Fixed: auto closing of duplicates doesn't work.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1162 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/models/issue.rb b/app/models/issue.rb
index a1c46cadf6cccc2e25e8c737d56e7ead60f880d1..8dcacde721306c8839030d45744246bc7abf2ef8 100644 (file)
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -142,6 +142,9 @@ class Issue < ActiveRecord::Base
   end
   
   def after_save
+    # Reload is needed in order to get the right status
+    reload
+    
     # Update start/due dates of following issues
     relations_from.each(&:set_issue_to_dates)
     
@@ -165,6 +168,7 @@ class Issue < ActiveRecord::Base
   def init_journal(user, notes = "")
     @current_journal ||= Journal.new(:journalized => self, :user => user, :notes => notes)
     @issue_before_change = self.clone
+    @issue_before_change.status = self.status
     @custom_values_before_change = {}
     self.custom_values.each {|c| @custom_values_before_change.store c.custom_field_id, c.value }
     @current_journal

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index a8566a7a2130b678ae285f68f3ee1e1add3486a0..a1357d89cd2eb9028d6409fe27cce0370b6c8e8c 100644 (file)
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -31,7 +31,6 @@ class Mailer < ActionMailer::Base
 
   def issue_edit(journal)
     issue = journal.journalized
-    issue.reload
     recipients issue.recipients
     # Watchers in cc
     cc(issue.watcher_recipients - @recipients)