Fixed: auto closing of duplicates doesn't work.

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

Fixed: auto closing of duplicates doesn't work.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1162 e93f8b46-1217-0410-a6f0-8f06a7374b81
652dc1a7 · Jean-Philippe Lang · e5daf256 · 652dc1a7 · 652dc1a7
Commit 652dc1a7 authored Feb 17, 2008 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

issue.rb app/models/issue.rb +4 -0

mailer.rb app/models/mailer.rb +0 -1

No files found.
--- 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

--- 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)