From 1ada789a6ccbbbaa55adc3a661ea7cef917d4b71 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Sat, 22 Nov 2014 13:52:32 +0000 Subject: Merged r13640 from 2.6-stable to trunk (#18280) git-svn-id: http://svn.redmine.org/redmine/trunk@13641 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/issue_status.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/models') diff --git a/app/models/issue_status.rb b/app/models/issue_status.rb index e14cf5a0a..b488f2b66 100644 --- a/app/models/issue_status.rb +++ b/app/models/issue_status.rb @@ -99,7 +99,8 @@ class IssueStatus < ActiveRecord::Base " JOIN #{JournalDetail.table_name} d ON d.journal_id = j.id" + " WHERE j.journalized_type = 'Issue' AND j.journalized_id = #{Issue.table_name}.id" + " AND d.property = 'attr' AND d.prop_key = 'status_id' AND d.value = :status_id" - Issue.where(:status_id => id, :closed_on => nil).update_all(["closed_on = (#{subselect})", :status_id => id.to_s]) + Issue.where(:status_id => id, :closed_on => nil). + update_all(["closed_on = (#{subselect})", {:status_id => id.to_s}]) # Then we update issues that don't have a journal which means the # current status was set on creation -- cgit v1.2.3