jro_apps/redmine Commit - r5950:d5cc7424a815

Do not show inactive issue priorities where not necessary (#8573)....

Jean-Baptiste Barth -

r5950:d5cc7424a815

parent child

Context file:

r5950:d5cc7424a815

Collapse all files

app/controllers/context_menus_controller.rb +1 -1

                   @trackers = @projects.map(&:trackers).inject{|memo,t| memo & t}
                 end
-                @priorities = IssuePriority.all.reverse
+                @priorities = IssuePriority.active.reverse
                 @statuses = IssueStatus.find(:all, :order => 'position')
                 @back = back_url

app/controllers/issues_controller.rb +3 -3

                 @relations = @issue.relations.select {|r| r.other_issue(@issue) && r.other_issue(@issue).visible? }
                 @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
                 @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
-                @priorities = IssuePriority.all
+                @priorities = IssuePriority.active
                 @time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project)
                 respond_to do |format|
                   format.html { render :template => 'issues/show.rhtml' }
               # TODO: Refactor, not everything in here is needed by #edit
               def update_issue_from_params
                 @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
-                @priorities = IssuePriority.all
+                @priorities = IssuePriority.active
                 @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
                 @time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project)
                 @time_entry.attributes = params[:time_entry]
                     @issue.watcher_user_ids = params[:issue]['watcher_user_ids']
                   end
                 end
-                @priorities = IssuePriority.all
+                @priorities = IssuePriority.active
                 @allowed_statuses = @issue.new_statuses_allowed_to(User.current, true)
               end

app/views/issue_moves/new.rhtml +1 -1

             <p>
               <label><%= l(:field_priority) %></label>
-              <%= select_tag('priority_id', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(IssuePriority.all, :id, :name)) %>
+              <%= select_tag('priority_id', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(IssuePriority.active, :id, :name)) %>
             </p>
             <p>

app/views/issues/bulk_edit.rhtml +1 -1

             <% end %>
             <p>
             	<label><%= l(:field_priority) %></label>
-            	<%= select_tag('issue[priority_id]', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(IssuePriority.all, :id, :name)) %>
+            	<%= select_tag('issue[priority_id]', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(IssuePriority.active, :id, :name)) %>
             </p>
             <p>
             	<label><%= l(:field_assigned_to) %></label>

test/fixtures/enumerations.yml +6 0

@@ -81,3 +81,9 enumerations_014:
81	type: TimeEntryActivity	81	type: TimeEntryActivity
82	position: 4	82	position: 4
83	active: false	83	active: false
		84	enumerations_015:
		85	name: Inactive Priority
		86	id: 15
		87	type: IssuePriority
		88	position: 6
		89	active: false

test/functional/context_menus_controller_test.rb +1 0

                 assert_tag :tag => 'a', :content => 'Immediate',
                                         :attributes => { :href => '/issues/bulk_edit?ids%5B%5D=1&amp;issue%5Bpriority_id%5D=8',
                                                          :class => '' }
+                assert_no_tag :tag => 'a', :content => 'Inactive Priority'
                 # Versions
                 assert_tag :tag => 'a', :content => '2.0',
                                         :attributes => { :href => '/issues/bulk_edit?ids%5B%5D=1&amp;issue%5Bfixed_version_id%5D=3',

test/functional/issue_moves_controller_test.rb +19 0

@@ -7,6 +7,25 class IssueMovesControllerTest < ActionController::TestCase
7	User.current = nil	7	User.current = nil
8	end	8	end
9		9
		10	def test_get_issue_moves_new
		11	@request.session[:user_id] = 2
		12	get :new, :id => 1
		13
		14	assert_tag :tag => 'option', :content => 'eCookbook',
		15	:attributes => { :value => '1', :selected => 'selected' }
		16	%w(new_tracker_id status_id priority_id assigned_to_id).each do \|field\|
		17	assert_tag :tag => 'option', :content => '(No change)', :attributes => { :value => '' },
		18	:parent => {:tag => 'select', :attributes => {:id => field}}
		19	assert_no_tag :tag => 'option', :attributes => {:selected => 'selected'},
		20	:parent => {:tag => 'select', :attributes => {:id => field}}
		21	end
		22
		23	# Be sure we don't include inactive enumerations
		24	assert ! IssuePriority.find(15).active?
		25	assert_no_tag :option, :attributes => {:value => '15'},
		26	:parent => {:tag => 'select', :attributes => {:id => 'priority_id'} }
		27	end
		28
10	def test_create_one_issue_to_another_project	29	def test_create_one_issue_to_another_project
11	@request.session[:user_id] = 2	30	@request.session[:user_id] = 2
12	post :create, :id => 1, :new_project_id => 2, :tracker_id => '', :assigned_to_id => '', :status_id => '', :start_date => '', :due_date => ''	31	post :create, :id => 1, :new_project_id => 2, :tracker_id => '', :assigned_to_id => '', :status_id => '', :start_date => '', :due_date => ''

test/functional/issues_controller_test.rb +25 0

                                                         :content => /Notes/ } }
               end
+              def test_update_form_should_not_display_inactive_enumerations
+                @request.session[:user_id] = 2
+                get :show, :id => 1
+                assert_response :success
+                assert ! IssuePriority.find(15).active?
+                assert_no_tag :option, :attributes => {:value => '15'},
+                                       :parent => {:tag => 'select', :attributes => {:id => 'issue_priority_id'} }
+              end
               def test_show_should_deny_anonymous_access_without_permission
                 Role.anonymous.remove_permission!(:view_issues)
                 get :show, :id => 1
                 assert_tag :tag => 'input', :attributes => { :name => 'issue[custom_field_values][2]',
                                                              :value => 'Default string' }
+                # Be sure we don't display inactive IssuePriorities
+                assert ! IssuePriority.find(15).active?
+                assert_no_tag :option, :attributes => {:value => '15'},
+                                       :parent => {:tag => 'select', :attributes => {:id => 'issue_priority_id'} }
               end
               def test_get_new_without_tracker_id
                 assert_template 'edit'
                 assert_not_nil assigns(:issue)
                 assert_equal Issue.find(1), assigns(:issue)
+                # Be sure we don't display inactive IssuePriorities
+                assert ! IssuePriority.find(15).active?
+                assert_no_tag :option, :attributes => {:value => '15'},
+                                       :parent => {:tag => 'select', :attributes => {:id => 'issue_priority_id'} }
               end
               def test_get_edit_with_params
                 # System wide custom field
                 assert CustomField.find(1).is_for_all?
                 assert_tag :select, :attributes => {:name => 'issue[custom_field_values][1]'}
+                # Be sure we don't display inactive IssuePriorities
+                assert ! IssuePriority.find(15).active?
+                assert_no_tag :option, :attributes => {:value => '15'},
+                                       :parent => {:tag => 'select', :attributes => {:id => 'issue_priority_id'} }
               end
               def test_get_bulk_edit_on_different_projects

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