From: Jean-Philippe Lang Date: Sun, 22 Apr 2007 22:20:09 +0000 (+0000) Subject: The ability to change the issue status to the same status is no longer forced. X-Git-Tag: 0.5.1~123 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=feb973b97052b80e5b85d64e05e8aca5e07a754c;p=redmine.git The ability to change the issue status to the same status is no longer forced. This behaviour can be defined in workflow setup. git-svn-id: http://redmine.rubyforge.org/svn/trunk@470 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/models/issue_status.rb b/app/models/issue_status.rb index de8a1391e..61cb3f282 100644 --- a/app/models/issue_status.rb +++ b/app/models/issue_status.rb @@ -38,16 +38,14 @@ class IssueStatus < ActiveRecord::Base # Returns an array of all statuses the given role can switch to # Uses association cache when called more than one time def new_statuses_allowed_to(role, tracker) - new_statuses = [self] - new_statuses += workflows.select {|w| w.role_id == role.id && w.tracker_id == tracker.id}.collect{|w| w.new_status} if role && tracker + new_statuses = workflows.select {|w| w.role_id == role.id && w.tracker_id == tracker.id}.collect{|w| w.new_status} if role && tracker new_statuses.sort{|x, y| x.position <=> y.position } 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(role, tracker) - new_statuses = [self] - new_statuses += workflows.find(:all, + new_statuses = workflows.find(:all, :include => :new_status, :conditions => ["role_id=? and tracker_id=?", role.id, tracker.id]).collect{ |w| w.new_status } if role && tracker new_statuses.sort{|x, y| x.position <=> y.position }