jro_apps/redmine Commit - r13821:97939f8829b4

Merges r14151 to r14153 (#19163)....

Jean-Philippe Lang -

r13821:97939f8829b4

parent child

Context file:

r13821:97939f8829b4

Collapse all files

app/controllers/issues_controller.rb +1 -1

                 else
                   @available_statuses = @issues.map(&:new_statuses_allowed_to).reduce(:&)
                 end
-                @custom_fields = target_projects.map{|p|p.all_issue_custom_fields.visible}.reduce(:&)
+                @custom_fields = @issues.map{|i|i.editable_custom_fields}.reduce(:&)
                 @assignables = target_projects.map(&:assignable_users).reduce(:&)
                 @trackers = target_projects.map(&:trackers).reduce(:&)
                 @versions = target_projects.map {|p| p.shared_versions.open}.reduce(:&)

test/fixtures/custom_fields_trackers.yml +3 0

             custom_fields_trackers_009:
               custom_field_id: 8
               tracker_id: 3
+            custom_fields_trackers_010:
+              custom_field_id: 9
+              tracker_id: 1

test/functional/issues_controller_test.rb +15 -4

               def test_get_bulk_edit
                 @request.session[:user_id] = 2
-                get :bulk_edit, :ids => [1, 2]
+                get :bulk_edit, :ids => [1, 3]
                 assert_response :success
                 assert_template 'bulk_edit'
               end
               def test_get_bulk_edit_with_user_custom_field
-                field = IssueCustomField.create!(:name => 'Tester', :field_format => 'user', :is_for_all => true)
+                field = IssueCustomField.create!(:name => 'Tester', :field_format => 'user', :is_for_all => true, :tracker_ids => [1,2,3])
                 @request.session[:user_id] = 2
                 get :bulk_edit, :ids => [1, 2]
               end
               def test_get_bulk_edit_with_version_custom_field
-                field = IssueCustomField.create!(:name => 'Affected version', :field_format => 'version', :is_for_all => true)
+                field = IssueCustomField.create!(:name => 'Affected version', :field_format => 'version', :is_for_all => true, :tracker_ids => [1,2,3])
                 @request.session[:user_id] = 2
                 get :bulk_edit, :ids => [1, 2]
                 field.update_attribute :multiple, true
                 @request.session[:user_id] = 2
-                get :bulk_edit, :ids => [1, 2]
+                get :bulk_edit, :ids => [1, 3]
                 assert_response :success
                 assert_template 'bulk_edit'
                 end
               end
+              def test_bulk_edit_should_only_propose_issues_trackers_custom_fields
+                IssueCustomField.delete_all
+                field = IssueCustomField.generate!(:tracker_ids => [1], :is_for_all => true)
+                IssueCustomField.generate!(:tracker_ids => [2], :is_for_all => true)
+                @request.session[:user_id] = 2
+                issue_ids = Issue.where(:project_id => 1, :tracker_id => 1).limit(2).ids
+                get :bulk_edit, :ids => issue_ids
+                assert_equal [field], assigns(:custom_fields)
+              end
               def test_bulk_update
                 @request.session[:user_id] = 2
                 # update issues priority

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