diff app/models/issue_status.rb @ 1517:dffacf8a6908 redmine-2.5

Update to Redmine SVN revision 13367 on 2.5-stable branch
author Chris Cannam
date Tue, 09 Sep 2014 09:29:00 +0100
parents e248c7af89ec
children
line wrap: on
line diff
--- a/app/models/issue_status.rb	Tue Sep 09 09:28:31 2014 +0100
+++ b/app/models/issue_status.rb	Tue Sep 09 09:29:00 2014 +0100
@@ -32,7 +32,7 @@
   scope :named, lambda {|arg| where("LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip)}
 
   def update_default
-    IssueStatus.update_all({:is_default => false}, ['id <> ?', id]) if self.is_default?
+    IssueStatus.where(['id <> ?', id]).update_all({:is_default => false}) if self.is_default?
   end
 
   # Returns the default status for new issues
@@ -43,8 +43,8 @@
   # Update all the +Issues+ setting their done_ratio to the value of their +IssueStatus+
   def self.update_issue_done_ratios
     if Issue.use_status_for_done_ratio?
-      IssueStatus.where("default_done_ratio >= 0").all.each do |status|
-        Issue.update_all({:done_ratio => status.default_done_ratio}, {:status_id => status.id})
+      IssueStatus.where("default_done_ratio >= 0").each do |status|
+        Issue.where({:status_id => status.id}).update_all({:done_ratio => status.default_done_ratio})
       end
     end