From 652dc1a73af8f975e6e126b7b735d524efb40b6f Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 17 Feb 2008 15:02:54 +0000
Subject: [PATCH] Fixed: auto closing of duplicates doesn't work.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1162 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
app/models/issue.rb | 4 ++++
app/models/mailer.rb | 1 -
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/app/models/issue.rb b/app/models/issue.rb
index a1c46cadf..8dcacde72 100644
--- 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 a8566a7a2..a1357d89c 100644
--- 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)
--
GitLab