Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-03-24 13:21:04 +01:00
Code Issues Packages Projects Releases Activity

Merges r14151 to r14153 (#19163).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14203 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2015-04-25 07:32:42 +00:00
parent d950d7325f
commit 97939f8829
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/issues_controller.rb
View File

@@ -229,7 +229,7 @@ class IssuesController < ApplicationController
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(:&)

3
test/fixtures/custom_fields_trackers.yml vendored
View File

@@ -26,3 +26,6 @@ custom_fields_trackers_008:
custom_fields_trackers_009:
custom_field_id: 8
tracker_id: 3
custom_fields_trackers_010:
custom_field_id: 9
tracker_id: 1

19
test/functional/issues_controller_test.rb
View File

@@ -3389,7 +3389,7 @@ class IssuesControllerTest < ActionController::TestCase
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'
@@ -3440,7 +3440,7 @@ class IssuesControllerTest < ActionController::TestCase
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]
@@ -3453,7 +3453,7 @@ class IssuesControllerTest < ActionController::TestCase
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]
@@ -3470,7 +3470,7 @@ class IssuesControllerTest < ActionController::TestCase
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'
@@ -3536,6 +3536,17 @@ class IssuesControllerTest < ActionController::TestCase
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