jro_apps/redmine Commit - r12886:cc37898d15bd

Merged r13124 (#16755)....

Jean-Philippe Lang -

r12886:cc37898d15bd

parent child

Context file:

r12886:cc37898d15bd

app/controllers/context_menus_controller.rb +1 -1

                 @options_by_custom_field = {}
                 if @can[:edit]
-                  custom_fields = @issues.map(&:available_custom_fields).reduce(:&).reject(&:multiple?)
+                  custom_fields = @issues.map(&:editable_custom_fields).reduce(:&).reject(&:multiple?)
                   custom_fields.each do |field|
                     values = field.possible_values_options(@projects)
                     if values.present?

app/models/issue.rb +5 0

                 end
               end
+              # Returns the custom fields that can be edited by the given user
+              def editable_custom_fields(user=nil)
+                editable_custom_field_values(user).map(&:custom_field).uniq
+              end
               # Returns the names of attributes that are read-only for user or the current user
               # For users with multiple roles, the read-only fields are the intersection of
               # read-only fields of each role

test/functional/context_menus_controller_test.rb +12 0

@@ -198,6 +198,18 class ContextMenusControllerTest < ActionController::TestCase
198	end	198	end
199	end	199	end
200		200
		201	def test_context_menu_should_show_enabled_custom_fields_for_the_role_only
		202	enabled_cf = IssueCustomField.generate!(:field_format => 'bool', :is_for_all => true, :tracker_ids => [1], :visible => false, :role_ids => [1,2])
		203	disabled_cf = IssueCustomField.generate!(:field_format => 'bool', :is_for_all => true, :tracker_ids => [1], :visible => false, :role_ids => [2])
		204	issue = Issue.generate!(:project_id => 1, :tracker_id => 1)
		205
		206	@request.session[:user_id] = 2
		207	get :issues, :ids => [issue.id]
		208
		209	assert_select "li.cf_#{enabled_cf.id}"
		210	assert_select "li.cf_#{disabled_cf.id}", 0
		211	end
		212
201	def test_context_menu_by_assignable_user_should_include_assigned_to_me_link	213	def test_context_menu_by_assignable_user_should_include_assigned_to_me_link
202	@request.session[:user_id] = 2	214	@request.session[:user_id] = 2
203	get :issues, :ids => [1]	215	get :issues, :ids => [1]

test/unit/issue_test.rb +10 0

@@ -706,6 +706,16 class IssueTest < ActiveSupport::TestCase
706	assert values.detect {\|value\| value.custom_field == cf2}	706	assert values.detect {\|value\| value.custom_field == cf2}
707	end	707	end
708		708
		709	def test_editable_custom_fields_should_return_custom_field_that_is_enabled_for_the_role_only
		710	enabled_cf = IssueCustomField.generate!(:is_for_all => true, :tracker_ids => [1], :visible => false, :role_ids => [1,2])
		711	disabled_cf = IssueCustomField.generate!(:is_for_all => true, :tracker_ids => [1], :visible => false, :role_ids => [2])
		712	user = User.find(2)
		713	issue = Issue.new(:project_id => 1, :tracker_id => 1)
		714
		715	assert_include enabled_cf, issue.editable_custom_fields(user)
		716	assert_not_include disabled_cf, issue.editable_custom_fields(user)
		717	end
		718
709	def test_safe_attributes_should_accept_target_tracker_writable_fields	719	def test_safe_attributes_should_accept_target_tracker_writable_fields
710	WorkflowPermission.delete_all	720	WorkflowPermission.delete_all
711	WorkflowPermission.create!(:old_status_id => 1, :tracker_id => 1,	721	WorkflowPermission.create!(:old_status_id => 1, :tracker_id => 1,

General Comments 0

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

No TODOs yet

	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