Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-07-05 07:57:50 +02:00
Code Issues Packages Projects Releases Activity

Merged r14618 (#20360).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14653 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2015-10-09 06:43:03 +00:00
parent 5cec71b64c
commit 3ea387379d
2 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/models/project.rb
View File

@@ -526,11 +526,17 @@ class Project < ActiveRecord::Base
# Returns a scope of all custom fields enabled for project issues
# (explicitly associated custom fields and custom fields enabled for all projects)
def all_issue_custom_fields
@all_issue_custom_fields ||= IssueCustomField.
sorted.
where("is_for_all = ? OR id IN (SELECT DISTINCT cfp.custom_field_id" +
" FROM #{table_name_prefix}custom_fields_projects#{table_name_suffix} cfp" +
" WHERE cfp.project_id = ?)", true, id)
if new_record?
@all_issue_custom_fields ||= IssueCustomField.
sorted.
where("is_for_all = ? OR id IN (?)", true, issue_custom_field_ids)
else
@all_issue_custom_fields ||= IssueCustomField.
sorted.
where("is_for_all = ? OR id IN (SELECT DISTINCT cfp.custom_field_id" +
" FROM #{table_name_prefix}custom_fields_projects#{table_name_suffix} cfp" +
" WHERE cfp.project_id = ?)", true, id)
end
end
# Returns an array of all custom fields enabled for project time entries

14
test/functional/projects_controller_test.rb
View File

@@ -555,6 +555,20 @@ class ProjectsControllerTest < ActionController::TestCase
assert_response 404
end
def test_get_copy_should_preselect_custom_fields
field1 = IssueCustomField.generate!(:is_for_all => false)
field2 = IssueCustomField.generate!(:is_for_all => false)
source = Project.generate!(:issue_custom_fields => [field1])
@request.session[:user_id] = 1
get :copy, :id => source.id
assert_response :success
assert_select 'fieldset#project_issue_custom_fields' do
assert_select 'input[type=checkbox][value=?][checked=checked]', field1.id.to_s
assert_select 'input[type=checkbox][value=?]:not([checked])', field2.id.to_s
end
end
def test_post_copy_should_copy_requested_items
@request.session[:user_id] = 1 # admin
CustomField.delete_all