jro_apps/redmine Commit - r6180:5f79a6a19069

Fixed: additional workflow transitions not available when set to both author and assignee (#8836)....

Jean-Philippe Lang -

r6180:5f79a6a19069

parent child

Context file:

r6180:5f79a6a19069

Collapse all files

app/models/issue_status.rb +9 -7

             # redMine - project management software
             # Copyright (C) 2006  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
               has_many :workflows, :foreign_key => "old_status_id"
               acts_as_list
               before_destroy :delete_workflows
               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
                 IssueStatus.update_all("is_default=#{connection.quoted_false}", ['id <> ?', id]) if self.is_default?
               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?
                   IssueStatus.find(:all, :conditions => ["default_done_ratio >= 0"]).each do |status|
                     Issue.update_all(["done_ratio = ?", status.default_done_ratio],
                                      ["status_id = ?", status.id])
                   end
                 end
                 return Issue.use_status_for_done_ratio?
               end
               # 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(roles, tracker, author=false, assignee=false)
                 if roles && tracker
                   role_ids = roles.collect(&:id)
                   transitions = workflows.select do |w|
                     role_ids.include?(w.role_id) &&
                     w.tracker_id == tracker.id &&
-                    (author || !w.author) &&
+                    ((!w.author && !w.assignee) || (author && w.author) || (assignee && w.assignee))
-                    (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
+                if roles.present? && tracker
-                  conditions = {:role_id => roles.collect(&:id), :tracker_id => tracker.id}
+                  conditions = "(author = :false AND assignee = :false)"
-                  conditions[:author] = false unless author
+                  conditions << " OR author = :true" if author
-                  conditions[:assignee] = false unless assignee
+                  conditions << " OR assignee = :true" if assignee
                   workflows.find(:all,
                     :include => :new_status,
-                                 :conditions => conditions).collect{|w| w.new_status}.compact.sort
+                    :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
               end
               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}])
               end
             end

test/unit/issue_status_test.rb +4 -4

             # redMine - project management software
             # Copyright (C) 2006-2007  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.
             require File.expand_path('../../test_helper', __FILE__)
             class IssueStatusTest < ActiveSupport::TestCase
               fixtures :issue_statuses, :issues, :roles, :trackers
               def test_create
                 status = IssueStatus.new :name => "Assigned"
                 assert !status.save
                 # status name uniqueness
                 assert_equal 1, status.errors.count
                 status.name = "Test Status"
                 assert status.save
                 assert !status.is_default
               end
               def test_destroy
                 status = IssueStatus.find(3)
                 assert_difference 'IssueStatus.count', -1 do
                   assert status.destroy
                 end
                 assert_nil Workflow.first(:conditions => {:old_status_id => status.id})
                 assert_nil Workflow.first(:conditions => {:new_status_id => status.id})
               end
               def test_destroy_status_in_use
                 # Status assigned to an Issue
                 status = Issue.find(1).status
                 assert_raise(RuntimeError, "Can't delete status") { status.destroy }
               end
               def test_default
                 status = IssueStatus.default
                 assert_kind_of IssueStatus, status
               end
               def test_change_default
                 status = IssueStatus.find(2)
                 assert !status.is_default
                 status.is_default = true
                 assert status.save
                 status.reload
                 assert_equal status, IssueStatus.default
                 assert !IssueStatus.find(1).is_default
               end
               def test_reorder_should_not_clear_default_status
                 status = IssueStatus.default
                 status.move_to_bottom
                 status.reload
                 assert status.is_default?
               end
               def test_new_statuses_allowed_to
                 Workflow.delete_all
                 Workflow.create!(:role_id => 1, :tracker_id => 1, :old_status_id => 1, :new_status_id => 2, :author => false, :assignee => false)
                 Workflow.create!(:role_id => 1, :tracker_id => 1, :old_status_id => 1, :new_status_id => 3, :author => true, :assignee => false)
                 Workflow.create!(:role_id => 1, :tracker_id => 1, :old_status_id => 1, :new_status_id => 4, :author => false, :assignee => true)
                 Workflow.create!(:role_id => 1, :tracker_id => 1, :old_status_id => 1, :new_status_id => 5, :author => true, :assignee => true)
                 status = IssueStatus.find(1)
                 role = Role.find(1)
                 tracker = Tracker.find(1)
                 assert_equal [2], status.new_statuses_allowed_to([role], tracker, false, false).map(&:id)
                 assert_equal [2], status.find_new_statuses_allowed_to([role], tracker, false, false).map(&:id)
-                assert_equal [2, 3], status.new_statuses_allowed_to([role], tracker, true, false).map(&:id)
+                assert_equal [2, 3, 5], status.new_statuses_allowed_to([role], tracker, true, false).map(&:id)
-                assert_equal [2, 3], status.find_new_statuses_allowed_to([role], tracker, true, false).map(&:id)
+                assert_equal [2, 3, 5], status.find_new_statuses_allowed_to([role], tracker, true, false).map(&:id)
-                assert_equal [2, 4], status.new_statuses_allowed_to([role], tracker, false, true).map(&:id)
+                assert_equal [2, 4, 5], status.new_statuses_allowed_to([role], tracker, false, true).map(&:id)
-                assert_equal [2, 4], status.find_new_statuses_allowed_to([role], tracker, false, true).map(&:id)
+                assert_equal [2, 4, 5], status.find_new_statuses_allowed_to([role], tracker, false, true).map(&:id)
                 assert_equal [2, 3, 4, 5], status.new_statuses_allowed_to([role], tracker, true, true).map(&:id)
                 assert_equal [2, 3, 4, 5], status.find_new_statuses_allowed_to([role], tracker, true, true).map(&:id)
               end
               context "#update_done_ratios" do
                 setup do
                   @issue = Issue.find(1)
                   @issue_status = IssueStatus.find(1)
                   @issue_status.update_attribute(:default_done_ratio, 50)
                 end
                 context "with Setting.issue_done_ratio using the issue_field" do
                   setup do
                     Setting.issue_done_ratio = 'issue_field'
                   end
                   should "change nothing" do
                     IssueStatus.update_issue_done_ratios
                     assert_equal 0, Issue.count(:conditions => {:done_ratio => 50})
                   end
                 end
                 context "with Setting.issue_done_ratio using the issue_status" do
                   setup do
                     Setting.issue_done_ratio = 'issue_status'
                   end
                   should "update all of the issue's done_ratios to match their Issue Status" do
                     IssueStatus.update_issue_done_ratios
                     issues = Issue.find([1,3,4,5,6,7,9,10])
                     issues.each do |issue|
                       assert_equal @issue_status, issue.status
                       assert_equal 50, issue.read_attribute(:done_ratio)
                     end
                   end
                 end
               end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages