jro_apps/redmine Commit - r3074:6bf0723d0654

0

app/controllers/workflows_controller.rb +6 -1

                 end
                 @roles = Role.find(:all, :order => 'builtin, position')
                 @trackers = Tracker.find(:all, :order => 'position')
-                @statuses = IssueStatus.find(:all, :order => 'position')
+                @used_statuses_only = (params[:used_statuses_only] == '0' ? false : true)
+                if @tracker && @used_statuses_only && @tracker.issue_statuses.any?
+                  @statuses = @tracker.issue_statuses
+                end
+                @statuses ||= IssueStatus.find(:all, :order => 'position')
               end
               def copy

0

app/models/tracker.rb +17 0

@@ -43,6 +43,23 class Tracker < ActiveRecord::Base
43	find(:all, :order => 'position')	43	find(:all, :order => 'position')
44	end	44	end
45		45
		46	# Returns an array of IssueStatus that are used
		47	# in the tracker's workflows
		48	def issue_statuses
		49	if @issue_statuses
		50	return @issue_statuses
		51	elsif new_record?
		52	return []
		53	end
		54
		55	ids = Workflow.
		56	connection.select_rows("SELECT DISTINCT old_status_id, new_status_id FROM #{Workflow.table_name} WHERE tracker_id = #{id}").
		57	flatten.
		58	uniq
		59
		60	@issue_statuses = IssueStatus.find_all_by_id(ids).sort
		61	end
		62
46	private	63	private
47	def check_integrity	64	def check_integrity
48	raise "Can't delete tracker" if Issue.find(:first, :conditions => ["tracker_id=?", self.id])	65	raise "Can't delete tracker" if Issue.find(:first, :conditions => ["tracker_id=?", self.id])

0

app/views/workflows/edit.rhtml +6 -2

               <label><%=l(:label_tracker)%>:</label>
             	<%= select_tag 'tracker_id', options_from_collection_for_select(@trackers, "id", "name", @tracker && @tracker.id) %>
-            	<%= submit_tag l(:button_edit), :name => nil %>
+              <%= hidden_field_tag 'used_statuses_only', '0' %>
+              <label><%= check_box_tag 'used_statuses_only', '1', @used_statuses_only %> <%= l(:label_display_used_statuses_only) %></label>
+            </p>
+            <p>
+            <%= submit_tag l(:button_edit), :name => nil %>
             </p>
             <% end %>

0

config/locales/bg.yml +1 0

               label_update_issue_done_ratios: Update issue done ratios
               setting_start_of_week: Start calendars on
               permission_view_issues: View Issues
+              label_display_used_statuses_only: Only display statuses that are used by this tracker

0

config/locales/bs.yml +1 0

               label_update_issue_done_ratios: Update issue done ratios
               setting_start_of_week: Start calendars on
               permission_view_issues: View Issues
+              label_display_used_statuses_only: Only display statuses that are used by this tracker

0

config/locales/ca.yml +1 0

               label_update_issue_done_ratios: Update issue done ratios
               setting_start_of_week: Start calendars on
               permission_view_issues: View Issues
+              label_display_used_statuses_only: Only display statuses that are used by this tracker

0

config/locales/cs.yml +1 0

               label_update_issue_done_ratios: Update issue done ratios
               setting_start_of_week: Start calendars on
               permission_view_issues: View Issues
+              label_display_used_statuses_only: Only display statuses that are used by this tracker

0

config/locales/da.yml +1 0

               label_update_issue_done_ratios: Update issue done ratios
               setting_start_of_week: Start calendars on
               permission_view_issues: View Issues
+              label_display_used_statuses_only: Only display statuses that are used by this tracker

0

config/locales/de.yml +1 0

               label_update_issue_done_ratios: Update issue done ratios
               setting_start_of_week: Start calendars on
               permission_view_issues: View Issues
+              label_display_used_statuses_only: Only display statuses that are used by this tracker

0

config/locales/el.yml +1 0

               label_update_issue_done_ratios: Update issue done ratios
               setting_start_of_week: Start calendars on
               permission_view_issues: View Issues
+              label_display_used_statuses_only: Only display statuses that are used by this tracker

0

config/locales/en.yml +1 0

               label_copy_source: Source
               label_copy_target: Target
               label_copy_same_as_target: Same as target
+              label_display_used_statuses_only: Only display statuses that are used by this tracker
               button_login: Login
               button_submit: Submit

0

config/locales/es.yml +1 0

               label_update_issue_done_ratios: Update issue done ratios
               setting_start_of_week: Start calendars on
               permission_view_issues: View Issues
+              label_display_used_statuses_only: Only display statuses that are used by this tracker

0

config/locales/fi.yml +1 0

               label_update_issue_done_ratios: Update issue done ratios
               setting_start_of_week: Start calendars on
               permission_view_issues: View Issues
+              label_display_used_statuses_only: Only display statuses that are used by this tracker

0

config/locales/fr.yml +1 0

               label_copy_target: Cible
               label_copy_same_as_target: Comme la cible
               label_update_issue_done_ratios: Mettre à jour l'avancement des demandes
+              label_display_used_statuses_only: N'afficher que les statuts utilisés dans ce tracker
               button_login: Connexion
               button_submit: Soumettre

0

config/locales/gl.yml +1 0

               label_update_issue_done_ratios: Update issue done ratios
               setting_start_of_week: Start calendars on
               permission_view_issues: View Issues
+              label_display_used_statuses_only: Only display statuses that are used by this tracker

0

config/locales/he.yml +1 0

               label_update_issue_done_ratios: Update issue done ratios
               setting_start_of_week: Start calendars on
               permission_view_issues: View Issues
+              label_display_used_statuses_only: Only display statuses that are used by this tracker

0

config/locales/hu.yml +1 0

               label_update_issue_done_ratios: Update issue done ratios
               setting_start_of_week: Start calendars on
               permission_view_issues: View Issues
+              label_display_used_statuses_only: Only display statuses that are used by this tracker

0

config/locales/it.yml +1 0

               label_update_issue_done_ratios: Update issue done ratios
               setting_start_of_week: Start calendars on
               permission_view_issues: View Issues
+              label_display_used_statuses_only: Only display statuses that are used by this tracker

0

config/locales/ja.yml +1 0

               label_update_issue_done_ratios: Update issue done ratios
               setting_start_of_week: Start calendars on
               permission_view_issues: View Issues
+              label_display_used_statuses_only: Only display statuses that are used by this tracker

0

config/locales/ko.yml +1 0

               label_update_issue_done_ratios: Update issue done ratios
               setting_start_of_week: Start calendars on
               permission_view_issues: View Issues
+              label_display_used_statuses_only: Only display statuses that are used by this tracker

0

config/locales/lt.yml +1 0

               error_workflow_copy_source: Please select a source tracker or role
               label_update_issue_done_ratios: Update issue done ratios
               permission_view_issues: View Issues
+              label_display_used_statuses_only: Only display statuses that are used by this tracker

0

config/locales/nl.yml +1 0

               label_update_issue_done_ratios: Update issue done ratios
               setting_start_of_week: Start calendars on
               permission_view_issues: View Issues
+              label_display_used_statuses_only: Only display statuses that are used by this tracker

0

config/locales/no.yml +1 0

               label_update_issue_done_ratios: Update issue done ratios
               setting_start_of_week: Start calendars on
               permission_view_issues: View Issues
+              label_display_used_statuses_only: Only display statuses that are used by this tracker

0

config/locales/pl.yml +1 0

               label_update_issue_done_ratios: Update issue done ratios
               setting_start_of_week: Start calendars on
               permission_view_issues: View Issues
+              label_display_used_statuses_only: Only display statuses that are used by this tracker

0

config/locales/pt-BR.yml +1 0

               field_watcher: Observador
               permission_view_issues: View Issues
+              label_display_used_statuses_only: Only display statuses that are used by this tracker

0

config/locales/pt.yml +1 0

               label_update_issue_done_ratios: Update issue done ratios
               setting_start_of_week: Start calendars on
               permission_view_issues: View Issues
+              label_display_used_statuses_only: Only display statuses that are used by this tracker

0

config/locales/ro.yml +1 0

               label_update_issue_done_ratios: Update issue done ratios
               setting_start_of_week: Start calendars on
               permission_view_issues: View Issues
+              label_display_used_statuses_only: Only display statuses that are used by this tracker

0

config/locales/ru.yml +1 0

               label_update_issue_done_ratios: Update issue done ratios
               setting_start_of_week: Start calendars on
               permission_view_issues: View Issues
+              label_display_used_statuses_only: Only display statuses that are used by this tracker

0

config/locales/sk.yml +1 0

               label_update_issue_done_ratios: Update issue done ratios
               setting_start_of_week: Start calendars on
               permission_view_issues: View Issues
+              label_display_used_statuses_only: Only display statuses that are used by this tracker

0

config/locales/sl.yml +1 0

               label_update_issue_done_ratios: Update issue done ratios
               setting_start_of_week: Start calendars on
               permission_view_issues: View Issues
+              label_display_used_statuses_only: Only display statuses that are used by this tracker

0

config/locales/sr.yml +1 0

               label_update_issue_done_ratios: Update issue done ratios
               setting_start_of_week: Start calendars on
               permission_view_issues: View Issues
+              label_display_used_statuses_only: Only display statuses that are used by this tracker

0

config/locales/sv.yml +1 0

               label_update_issue_done_ratios: Update issue done ratios
               setting_start_of_week: Start calendars on
               permission_view_issues: View Issues
+              label_display_used_statuses_only: Only display statuses that are used by this tracker

0

config/locales/th.yml +1 0

               label_update_issue_done_ratios: Update issue done ratios
               setting_start_of_week: Start calendars on
               permission_view_issues: View Issues
+              label_display_used_statuses_only: Only display statuses that are used by this tracker

0

config/locales/tr.yml +1 0

               label_update_issue_done_ratios: Update issue done ratios
               setting_start_of_week: Start calendars on
               permission_view_issues: View Issues
+              label_display_used_statuses_only: Only display statuses that are used by this tracker

0

config/locales/uk.yml +1 0

               label_update_issue_done_ratios: Update issue done ratios
               setting_start_of_week: Start calendars on
               permission_view_issues: View Issues
+              label_display_used_statuses_only: Only display statuses that are used by this tracker

0

config/locales/vi.yml +1 0

               label_update_issue_done_ratios: Update issue done ratios
               setting_start_of_week: Start calendars on
               permission_view_issues: View Issues
+              label_display_used_statuses_only: Only display statuses that are used by this tracker

0

config/locales/zh-TW.yml +1 0

               error_workflow_copy_source: Please select a source tracker or role
               label_update_issue_done_ratios: Update issue done ratios
               permission_view_issues: View Issues
+              label_display_used_statuses_only: Only display statuses that are used by this tracker

0

config/locales/zh.yml +1 0

               label_update_issue_done_ratios: Update issue done ratios
               setting_start_of_week: Start calendars on
               permission_view_issues: View Issues
+              label_display_used_statuses_only: Only display statuses that are used by this tracker

0

test/functional/workflows_controller_test.rb +33 -5

@@ -22,7 +22,7 require 'workflows_controller'
22	class WorkflowsController; def rescue_action(e) raise e end; end	22	class WorkflowsController; def rescue_action(e) raise e end; end
23		23
24	class WorkflowsControllerTest < ActionController::TestCase	24	class WorkflowsControllerTest < ActionController::TestCase
25	fixtures :roles, :trackers, :workflows, :users	25	fixtures :roles, :trackers, :workflows, :users, :issue_statuses
26		26
27	def setup	27	def setup
28	@controller = WorkflowsController.new	28	@controller = WorkflowsController.new
@@ -51,18 +51,46 class WorkflowsControllerTest < ActionController::TestCase
51	end	51	end
52		52
53	def test_get_edit_with_role_and_tracker	53	def test_get_edit_with_role_and_tracker
		54	Workflow.delete_all
		55	Workflow.create!(:role_id => 1, :tracker_id => 1, :old_status_id => 2, :new_status_id => 3)
		56	Workflow.create!(:role_id => 2, :tracker_id => 1, :old_status_id => 3, :new_status_id => 5)
		57
54	get :edit, :role_id => 2, :tracker_id => 1	58	get :edit, :role_id => 2, :tracker_id => 1
55	assert_response :success	59	assert_response :success
56	assert_template 'edit'	60	assert_template 'edit'
		61
		62	# used status only
		63	assert_not_nil assigns(:statuses)
		64	assert_equal [2, 3, 5], assigns(:statuses).collect(&:id)
		65
57	# allowed transitions	66	# allowed transitions
58	assert_tag :tag => 'input', :attributes => { :type => 'checkbox',	67	assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
59	:name => 'issue_status[2][]',	68	:name => 'issue_status[3][]',
60	:value => '1',	69	:value => '5',
61	:checked => 'checked' }	70	:checked => 'checked' }
62	# not allowed	71	# not allowed
63	assert_tag :tag => 'input', :attributes => { :type => 'checkbox',	72	assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
64	:name => 'issue_status[2][]',	73	:name => 'issue_status[3][]',
65	:value => '3',	74	:value => '2',
		75	:checked => nil }
		76	# unused
		77	assert_no_tag :tag => 'input', :attributes => { :type => 'checkbox',
		78	:name => 'issue_status[4][]' }
		79	end
		80
		81	def test_get_edit_with_role_and_tracker_and_all_statuses
		82	Workflow.delete_all
		83
		84	get :edit, :role_id => 2, :tracker_id => 1, :used_statuses_only => '0'
		85	assert_response :success
		86	assert_template 'edit'
		87
		88	assert_not_nil assigns(:statuses)
		89	assert_equal IssueStatus.count, assigns(:statuses).size
		90
		91	assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
		92	:name => 'issue_status[1][]',
		93	:value => '1',
66	:checked => nil }	94	:checked => nil }
67	end	95	end
68		96

0

test/unit/tracker_test.rb +17 -1

@@ -18,7 +18,7
18	require File.dirname(__FILE__) + '/../test_helper'	18	require File.dirname(__FILE__) + '/../test_helper'
19		19
20	class TrackerTest < ActiveSupport::TestCase	20	class TrackerTest < ActiveSupport::TestCase
21	fixtures :trackers, :workflows	21	fixtures :trackers, :workflows, :issue_statuses, :roles
22		22
23	def test_copy_workflows	23	def test_copy_workflows
24	source = Tracker.find(1)	24	source = Tracker.find(1)
@@ -30,4 +30,20 class TrackerTest < ActiveSupport::TestCase
30	target.reload	30	target.reload
31	assert_equal 89, target.workflows.size	31	assert_equal 89, target.workflows.size
32	end	32	end
		33
		34	def test_issue_statuses
		35	tracker = Tracker.find(1)
		36	Workflow.delete_all
		37	Workflow.create!(:role_id => 1, :tracker_id => 1, :old_status_id => 2, :new_status_id => 3)
		38	Workflow.create!(:role_id => 2, :tracker_id => 1, :old_status_id => 3, :new_status_id => 5)
		39
		40	assert_kind_of Array, tracker.issue_statuses
		41	assert_kind_of IssueStatus, tracker.issue_statuses.first
		42	assert_equal [2, 3, 5], Tracker.find(1).issue_statuses.collect(&:id)
		43	end
		44
		45	def test_issue_statuses_empty
		46	Workflow.delete_all("tracker_id = 1")
		47	assert_equal [], Tracker.find(1).issue_statuses
		48	end
33	end	49	end

	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