diff app/models/issue_status.rb @ 909:cbb26bc654de redmine-1.3

Update to Redmine 1.3-stable branch (Redmine SVN rev 8964)

--- a/app/models/issue_status.rb	Fri Feb 24 18:36:29 2012 +0000
+++ b/app/models/issue_status.rb	Fri Feb 24 19:09:32 2012 +0000
@@ -1,43 +1,44 @@
-# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Redmine - project management software
+# Copyright (C) 2006-2011  Jean-Philippe Lang
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class IssueStatus < ActiveRecord::Base
-  before_destroy :check_integrity  
+  before_destroy :check_integrity
   has_many :workflows, :foreign_key => "old_status_id"
   acts_as_list
-  
+
   before_destroy :delete_workflows
+  after_save     :update_default
 
   validates_presence_of :name
   validates_uniqueness_of :name
   validates_length_of :name, :maximum => 30
   validates_inclusion_of :default_done_ratio, :in => 0..100, :allow_nil => true
-  
+
   named_scope :named, lambda {|arg| { :conditions => ["LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip]}}
 
-  def after_save
+  def update_default
     IssueStatus.update_all("is_default=#{connection.quoted_false}", ['id <> ?', id]) if self.is_default?
-  end  
-  
+  end
+
   # Returns the default status for new issues
   def self.default
     find(:first, :conditions =>["is_default=?", true])
   end
-  
+
   # 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?
@@ -57,27 +58,29 @@
       role_ids = roles.collect(&:id)
       transitions = workflows.select do |w|
         role_ids.include?(w.role_id) &&
-        w.tracker_id == tracker.id && 
-        (author || !w.author) &&
-        (assignee || !w.assignee)
+        w.tracker_id == tracker.id &&
+        ((!w.author && !w.assignee) || (author && w.author) || (assignee && w.assignee))
       end
       transitions.collect{|w| w.new_status}.compact.sort
     else
       []
     end
   end
-  
+
   # Same thing as above but uses a database query
   # More efficient than the previous method if called just once
   def find_new_statuses_allowed_to(roles, tracker, author=false, assignee=false)
-    if roles && tracker
-      conditions = {:role_id => roles.collect(&:id), :tracker_id => tracker.id}
-      conditions[:author] = false unless author
-      conditions[:assignee] = false unless assignee
-      
+    if roles.present? && tracker
+      conditions = "(author = :false AND assignee = :false)"
+      conditions << " OR author = :true" if author
+      conditions << " OR assignee = :true" if assignee
+
       workflows.find(:all,
-                     :include => :new_status,
-                     :conditions => conditions).collect{|w| w.new_status}.compact.sort
+        :include => :new_status,
+        :conditions => ["role_id IN (:role_ids) AND tracker_id = :tracker_id AND (#{conditions})",
+          {:role_ids => roles.collect(&:id), :tracker_id => tracker.id, :true => true, :false => false}
+          ]
+        ).collect{|w| w.new_status}.compact.sort
     else
       []
     end
@@ -86,14 +89,14 @@
   def <=>(status)
     position <=> status.position
   end
-  
+
   def to_s; name end
 
 private
   def check_integrity
     raise "Can't delete status" if Issue.find(:first, :conditions => ["status_id=?", self.id])
   end
-  
+
   # Deletes associated workflows
   def delete_workflows
     Workflow.delete_all(["old_status_id = :id OR new_status_id = :id", {:id => id}])