jro_apps/redmine Commit - r4775:4b096e9a5676

Allow additional workflow transitions for issue author and assignee (#2732)....

Jean-Philippe Lang -

r4775:4b096e9a5676

parent child

Context file:

r4775:4b096e9a5676

Collapse all files

app/views/workflows/_form.html.erb created 644 +40 0

@@ -0,0 +1,40
	1	<table class="list transitions-<%= name %>">
	2	<thead>
	3	<tr>
	4	<th align="left">
	5	<%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('table.transitions-#{name} input')",
	6	:title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %>
	7	<%=l(:label_current_status)%>
	8	</th>
	9	<th align="center" colspan="<%= @statuses.length %>"><%=l(:label_new_statuses_allowed)%></th>
	10	</tr>
	11	<tr>
	12	<td></td>
	13	<% for new_status in @statuses %>
	14	<td width="<%= 75 / @statuses.size %>%" align="center">
	15	<%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('table.transitions-#{name} input.new-status-#{new_status.id}')",
	16	:title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %>
	17	<%=h new_status.name %>
	18	</td>
	19	<% end %>
	20	</tr>
	21	</thead>
	22	<tbody>
	23	<% for old_status in @statuses %>
	24	<tr class="<%= cycle("odd", "even") %>">
	25	<td>
	26	<%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('table.transitions-#{name} input.old-status-#{old_status.id}')",
	27	:title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %>
	28
	29	<%=h old_status.name %>
	30	</td>
	31	<% for new_status in @statuses -%>
	32	<td align="center">
	33	<%= check_box_tag "issue_status[#{ old_status.id }][#{new_status.id}][]", name, workflows.detect {\|w\| w.old_status_id == old_status.id && w.new_status_id == new_status.id},
	34	:class => "old-status-#{old_status.id} new-status-#{new_status.id}" %>
	35	</td>
	36	<% end -%>
	37	</tr>
	38	<% end %>
	39	</tbody>
	40	</table> No newline at end of file

db/migrate/20110220160626_add_workflows_assignee_and_author.rb created 644 +13 0

@@ -0,0 +1,13
	1	class AddWorkflowsAssigneeAndAuthor < ActiveRecord::Migration
	2	def self.up
	3	add_column :workflows, :assignee, :boolean, :null => false, :default => false
	4	add_column :workflows, :author, :boolean, :null => false, :default => false
	5	Workflow.update_all("assignee = #{Workflow.connection.quoted_false}")
	6	Workflow.update_all("author = #{Workflow.connection.quoted_false}")
	7	end
	8
	9	def self.down
	10	remove_column :workflows, :assignee
	11	remove_column :workflows, :author
	12	end
	13	end

app/controllers/workflows_controller.rb +14 -3

                 if request.post?
                   Workflow.destroy_all( ["role_id=? and tracker_id=?", @role.id, @tracker.id])
-                  (params[:issue_status] || []).each { |old, news|
+                  (params[:issue_status] || []).each { |status_id, transitions|
-                    news.each { |new|
+                    transitions.each { |new_status_id, options|
-                      @role.workflows.build(:tracker_id => @tracker.id, :old_status_id => old, :new_status_id => new)
+                      author = options.is_a?(Array) && options.include?('author') && !options.include?('always')
+                      assignee = options.is_a?(Array) && options.include?('assignee') && !options.include?('always')
+                      @role.workflows.build(:tracker_id => @tracker.id, :old_status_id => status_id, :new_status_id => new_status_id, :author => author, :assignee => assignee)
                     }
                   }
                   if @role.save
                     flash[:notice] = l(:notice_successful_update)
                     redirect_to :action => 'edit', :role_id => @role, :tracker_id => @tracker
+                    return
                   end
                 end
                   @statuses = @tracker.issue_statuses
                 end
                 @statuses ||= IssueStatus.find(:all, :order => 'position')
+                if @tracker && @role && @statuses.any?
+                  workflows = Workflow.all(:conditions => {:role_id => @role.id, :tracker_id => @tracker.id})
+                  @workflows = {}
+                  @workflows['always'] = workflows.select {|w| !w.author && !w.assignee}
+                  @workflows['author'] = workflows.select {|w| w.author}
+                  @workflows['assignee'] = workflows.select {|w| w.assignee}
+                end
               end
               def copy

app/models/issue.rb +6 -1

               # Returns an array of status that user is able to apply
               def new_statuses_allowed_to(user, include_default=false)
-                statuses = status.find_new_statuses_allowed_to(user.roles_for_project(project), tracker)
+                statuses = status.find_new_statuses_allowed_to(
+                  user.roles_for_project(project),
+                  tracker,
+                  author == user,
+                  assigned_to_id_changed? ? assigned_to_id_was == user.id : assigned_to_id == user.id
+                  )
                 statuses << status unless statuses.empty?
                 statuses << IssueStatus.default if include_default
                 statuses = statuses.uniq.sort

app/models/issue_status.rb +14 -13

               # 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)
+              def new_statuses_allowed_to(roles, tracker, author=false, assignee=false)
                 if roles && tracker
                   role_ids = roles.collect(&:id)
-                  new_statuses = workflows.select {|w| role_ids.include?(w.role_id) && w.tracker_id == tracker.id}.collect{|w| w.new_status}.compact.sort
+                  transitions = workflows.select do |w|
+                    role_ids.include?(w.role_id) &&
+                    w.tracker_id == tracker.id &&
+                    (author || !w.author) &&
+                    (assignee || !w.assignee)
+                  end
+                  transitions.collect{|w| w.new_status}.compact.sort
                 else
                   []
                 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)
+              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
                   workflows.find(:all,
                                  :include => :new_status,
-                                 :conditions => { :role_id => roles.collect(&:id),
+                                 :conditions => conditions).collect{|w| w.new_status}.compact.sort
-                                                  :tracker_id => tracker.id}).collect{ |w| w.new_status }.compact.sort
                 else
                   []
                 end
               end
-              def new_status_allowed_to?(status, roles, tracker)
-                if status && roles && tracker
-                  !workflows.find(:first, :conditions => {:new_status_id => status.id, :role_id => roles.collect(&:id), :tracker_id => tracker.id}).nil?
-                else
-                  false
-                end
-              end
               def <=>(status)
                 position <=> status.position

app/views/workflows/edit.rhtml +24 -47

@@ -20,54 +20,31
20	</p>	20	</p>
21	<% end %>	21	<% end %>
22		22
23
24	<% if @tracker && @role && @statuses.any? %>	23	<% if @tracker && @role && @statuses.any? %>
25	<% form_tag({}, :id => 'workflow_form' ) do %>	24	<% form_tag({}, :id => 'workflow_form' ) do %>
26	<%= hidden_field_tag 'tracker_id', @tracker.id %>	25	<%= hidden_field_tag 'tracker_id', @tracker.id %>
27	<%= hidden_field_tag 'role_id', @role.id %>	26	<%= hidden_field_tag 'role_id', @role.id %>
28	<div class="autoscroll">	27	<div class="autoscroll">
29	<table class="list">	28	<%= render :partial => 'form', :locals => {:name => 'always', :workflows => @workflows['always']} %>
30	<thead>	29
31	<tr>	30	<fieldset class="collapsible" style="padding: 0; margin-top: 0.5em;">
32	<th align="left"><%=l(:label_current_status)%></th>	31	<legend onclick="toggleFieldset(this);">Autorisations supplémentaires lorsque l'utilisateur a créé la demande</legend>
33	<th align="center" colspan="<%= @statuses.length %>"><%=l(:label_new_statuses_allowed)%></th>	32	<div id="author_workflows" style="margin: 0.5em 0 0.5em 0;">
34	</tr>	33	<%= render :partial => 'form', :locals => {:name => 'author', :workflows => @workflows['author']} %>
35	<tr>	34	</div>
36	<td></td>	35	</fieldset>
37	<% for new_status in @statuses %>	36	<%= javascript_tag "hideFieldset($('author_workflows'))" unless @workflows['author'].present? %>
38	<td width="<%= 75 / @statuses.size %>%" align="center">	37
39	<%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('input.new-status-#{new_status.id}')",	38	<fieldset class="collapsible" style="padding: 0;">
40	:title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %>	39	<legend onclick="toggleFieldset(this);">Autorisations supplémentaires lorsque la demande est assignée à l'utilisateur</legend>
41	<%= new_status.name %>	40	<div id="assignee_workflows" style="margin: 0.5em 0 0.5em 0;">
42	</td>	41	<%= render :partial => 'form', :locals => {:name => 'assignee', :workflows => @workflows['assignee']} %>
43	<% end %>	42	</div>
44	</tr>	43	</fieldset>
45	</thead>	44	<%= javascript_tag "hideFieldset($('assignee_workflows'))" unless @workflows['assignee'].present? %>
46	<tbody>	45	</div>
47	<% for old_status in @statuses %>	46	<%= submit_tag l(:button_save) %>
48	<tr class="<%= cycle("odd", "even") %>">	47	<% end %>
49	<td>
50	<%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('input.old-status-#{old_status.id}')",
51	:title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %>
52
53	<%= old_status.name %>
54	</td>
55	<% new_status_ids_allowed = old_status.find_new_statuses_allowed_to([@role], @tracker).collect(&:id) -%>
56	<% for new_status in @statuses -%>
57	<td align="center">
58	<%= check_box_tag "issue_status[#{ old_status.id }][]", new_status.id, new_status_ids_allowed.include?(new_status.id),
59	:class => "old-status-#{old_status.id} new-status-#{new_status.id}" %>
60	</td>
61	<% end -%>
62	</tr>
63	<% end %>
64	</tbody>
65	</table>
66	</div>
67	<p><%= check_all_links 'workflow_form' %></p>
68
69	<%= submit_tag l(:button_save) %>
70	<% end %>
71	<% end %>	48	<% end %>
72		49
73	<% html_title(l(:label_workflow)) -%>	50	<% html_title(l(:label_workflow)) -%>

public/javascripts/application.js +6 0

             	Effect.toggle(fieldset.down('div'), 'slide', {duration:0.2});
             }
+            function hideFieldset(el) {
+            	var fieldset = Element.up(el, 'fieldset');
+            	fieldset.toggleClassName('collapsed');
+            	fieldset.down('div').hide();
+            }
             var fileFieldCount = 1;
             function addFileField() {

test/fixtures/issue_statuses.yml +16 -10

             ---
-            issue_statuses_006:
-              name: Rejected
-              is_default: false
-              is_closed: true
-              id: 6
             issue_statuses_001:
+              id: 1
               name: New
               is_default: true
               is_closed: false
-              id: 1
+              position: 1
             issue_statuses_002:
+              id: 2
               name: Assigned
               is_default: false
               is_closed: false
-              id: 2
+              position: 2
             issue_statuses_003:
+              id: 3
               name: Resolved
               is_default: false
               is_closed: false
-              id: 3
+              position: 3
             issue_statuses_004:
               name: Feedback
+              id: 4
               is_default: false
               is_closed: false
-              id: 4
+              position: 4
             issue_statuses_005:
+              id: 5
               name: Closed
               is_default: false
               is_closed: true
-              id: 5
+              position: 5
+            issue_statuses_006:
+              id: 6
+              name: Rejected
+              is_default: false
+              is_closed: true
+              position: 6

test/functional/workflows_controller_test.rb +36 -8

                 # allowed transitions
                 assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
-                                                             :name => 'issue_status[3][]',
+                                                             :name => 'issue_status[3][5][]',
-                                                             :value => '5',
+                                                             :value => 'always',
                                                              :checked => 'checked' }
                 # not allowed
                 assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
-                                                             :name => 'issue_status[3][]',
+                                                             :name => 'issue_status[3][2][]',
-                                                             :value => '2',
+                                                             :value => 'always',
                                                              :checked => nil }
                 # unused
                 assert_no_tag :tag => 'input', :attributes => { :type => 'checkbox',
-                                                                :name => 'issue_status[4][]' }
+                                                                :name => 'issue_status[1][1][]' }
               end
               def test_get_edit_with_role_and_tracker_and_all_statuses
                 assert_equal IssueStatus.count, assigns(:statuses).size
                 assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
-                                                             :name => 'issue_status[1][]',
+                                                             :name => 'issue_status[1][1][]',
-                                                             :value => '1',
+                                                             :value => 'always',
                                                              :checked => nil }
               end
               def test_post_edit
-                post :edit, :role_id => 2, :tracker_id => 1, :issue_status => {'4' => ['5'], '3' => ['1', '2']}
+                post :edit, :role_id => 2, :tracker_id => 1,
+                  :issue_status => {
+                    '4' => {'5' => ['always']},
+                    '3' => {'1' => ['always'], '2' => ['always']}
+                  }
                 assert_redirected_to '/workflows/edit?role_id=2&tracker_id=1'
                 assert_equal 3, Workflow.count(:conditions => {:tracker_id => 1, :role_id => 2})
                 assert_nil      Workflow.find(:first, :conditions => {:role_id => 2, :tracker_id => 1, :old_status_id => 5, :new_status_id => 4})
               end
+              def test_post_edit_with_additional_transitions
+                post :edit, :role_id => 2, :tracker_id => 1,
+                  :issue_status => {
+                    '4' => {'5' => ['always']},
+                    '3' => {'1' => ['author'], '2' => ['assignee'], '4' => ['author', 'assignee']}
+                  }
+                assert_redirected_to '/workflows/edit?role_id=2&tracker_id=1'
+                assert_equal 4, Workflow.count(:conditions => {:tracker_id => 1, :role_id => 2})
+                w = Workflow.find(:first, :conditions => {:role_id => 2, :tracker_id => 1, :old_status_id => 4, :new_status_id => 5})
+                assert ! w.author
+                assert ! w.assignee
+                w = Workflow.find(:first, :conditions => {:role_id => 2, :tracker_id => 1, :old_status_id => 3, :new_status_id => 1})
+                assert w.author
+                assert ! w.assignee
+                w = Workflow.find(:first, :conditions => {:role_id => 2, :tracker_id => 1, :old_status_id => 3, :new_status_id => 2})
+                assert ! w.author
+                assert w.assignee
+                w = Workflow.find(:first, :conditions => {:role_id => 2, :tracker_id => 1, :old_status_id => 3, :new_status_id => 4})
+                assert w.author
+                assert w.assignee
+              end
               def test_clear_workflow
                 assert Workflow.count(:conditions => {:tracker_id => 1, :role_id => 2}) > 0

test/unit/issue_status_test.rb +25 -1

@@ -18,7 +18,7
18	require File.expand_path('../../test_helper', __FILE__)	18	require File.expand_path('../../test_helper', __FILE__)
19		19
20	class IssueStatusTest < ActiveSupport::TestCase	20	class IssueStatusTest < ActiveSupport::TestCase
21	fixtures :issue_statuses, :issues	21	fixtures :issue_statuses, :issues, :roles, :trackers
22		22
23	def test_create	23	def test_create
24	status = IssueStatus.new :name => "Assigned"	24	status = IssueStatus.new :name => "Assigned"
@@ -68,6 +68,30 class IssueStatusTest < ActiveSupport::TestCase
68	status.reload	68	status.reload
69	assert status.is_default?	69	assert status.is_default?
70	end	70	end
		71
		72	def test_new_statuses_allowed_to
		73	Workflow.delete_all
		74
		75	Workflow.create!(:role_id => 1, :tracker_id => 1, :old_status_id => 1, :new_status_id => 2, :author => false, :assignee => false)
		76	Workflow.create!(:role_id => 1, :tracker_id => 1, :old_status_id => 1, :new_status_id => 3, :author => true, :assignee => false)
		77	Workflow.create!(:role_id => 1, :tracker_id => 1, :old_status_id => 1, :new_status_id => 4, :author => false, :assignee => true)
		78	Workflow.create!(:role_id => 1, :tracker_id => 1, :old_status_id => 1, :new_status_id => 5, :author => true, :assignee => true)
		79	status = IssueStatus.find(1)
		80	role = Role.find(1)
		81	tracker = Tracker.find(1)
		82
		83	assert_equal [2], status.new_statuses_allowed_to([role], tracker, false, false).map(&:id)
		84	assert_equal [2], status.find_new_statuses_allowed_to([role], tracker, false, false).map(&:id)
		85
		86	assert_equal [2, 3], status.new_statuses_allowed_to([role], tracker, true, false).map(&:id)
		87	assert_equal [2, 3], status.find_new_statuses_allowed_to([role], tracker, true, false).map(&:id)
		88
		89	assert_equal [2, 4], status.new_statuses_allowed_to([role], tracker, false, true).map(&:id)
		90	assert_equal [2, 4], status.find_new_statuses_allowed_to([role], tracker, false, true).map(&:id)
		91
		92	assert_equal [2, 3, 4, 5], status.new_statuses_allowed_to([role], tracker, true, true).map(&:id)
		93	assert_equal [2, 3, 4, 5], status.find_new_statuses_allowed_to([role], tracker, true, true).map(&:id)
		94	end
71		95
72	context "#update_done_ratios" do	96	context "#update_done_ratios" do
73	setup do	97	setup do

test/unit/issue_test.rb +27 0

@@ -210,6 +210,33 class IssueTest < ActiveSupport::TestCase
210	assert_equal IssueCategory.find(1).assigned_to, issue.assigned_to	210	assert_equal IssueCategory.find(1).assigned_to, issue.assigned_to
211	end	211	end
212		212
		213
		214
		215	def test_new_statuses_allowed_to
		216	Workflow.delete_all
		217
		218	Workflow.create!(:role_id => 1, :tracker_id => 1, :old_status_id => 1, :new_status_id => 2, :author => false, :assignee => false)
		219	Workflow.create!(:role_id => 1, :tracker_id => 1, :old_status_id => 1, :new_status_id => 3, :author => true, :assignee => false)
		220	Workflow.create!(:role_id => 1, :tracker_id => 1, :old_status_id => 1, :new_status_id => 4, :author => false, :assignee => true)
		221	Workflow.create!(:role_id => 1, :tracker_id => 1, :old_status_id => 1, :new_status_id => 5, :author => true, :assignee => true)
		222	status = IssueStatus.find(1)
		223	role = Role.find(1)
		224	tracker = Tracker.find(1)
		225	user = User.find(2)
		226
		227	issue = Issue.generate!(:tracker => tracker, :status => status, :project_id => 1)
		228	assert_equal [1, 2], issue.new_statuses_allowed_to(user).map(&:id)
		229
		230	issue = Issue.generate!(:tracker => tracker, :status => status, :project_id => 1, :author => user)
		231	assert_equal [1, 2, 3], issue.new_statuses_allowed_to(user).map(&:id)
		232
		233	issue = Issue.generate!(:tracker => tracker, :status => status, :project_id => 1, :assigned_to => user)
		234	assert_equal [1, 2, 4], issue.new_statuses_allowed_to(user).map(&:id)
		235
		236	issue = Issue.generate!(:tracker => tracker, :status => status, :project_id => 1, :author => user, :assigned_to => user)
		237	assert_equal [1, 2, 3, 4, 5], issue.new_statuses_allowed_to(user).map(&:id)
		238	end
		239
213	def test_copy	240	def test_copy
214	issue = Issue.new.copy_from(1)	241	issue = Issue.new.copy_from(1)
215	assert issue.save	242	assert issue.save

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