mirror of
https://github.com/meineerde/redmine.git
synced 2026-03-25 18:30:01 +00:00
Fixed that query roles are not copied when copying a project (#17202).
git-svn-id: http://svn.redmine.org/redmine/trunk@13329 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
58c5c29c1f
commit
9f7901e364
@ -952,6 +952,7 @@ class Project < ActiveRecord::Base
|
||||
new_query.sort_criteria = query.sort_criteria if query.sort_criteria
|
||||
new_query.project = self
|
||||
new_query.user_id = query.user_id
|
||||
new_query.role_ids = query.role_ids if query.visibility == IssueQuery::VISIBILITY_ROLES
|
||||
self.queries << new_query
|
||||
end
|
||||
end
|
||||
|
||||
@ -178,6 +178,14 @@ module ObjectHelpers
|
||||
changeset.save!
|
||||
changeset
|
||||
end
|
||||
|
||||
def Query.generate!(attributes={})
|
||||
query = new(attributes)
|
||||
query.name = "Generated query" if query.name.blank?
|
||||
query.user ||= User.find(1)
|
||||
query.save!
|
||||
query
|
||||
end
|
||||
end
|
||||
|
||||
module IssueObjectHelpers
|
||||
|
||||
@ -222,6 +222,17 @@ class ProjectCopyTest < ActiveSupport::TestCase
|
||||
assert_equal @source_project.queries.map(&:user_id).sort, @project.queries.map(&:user_id).sort
|
||||
end
|
||||
|
||||
def test_copy_should_copy_queries_roles_visibility
|
||||
source = Project.generate!
|
||||
target = Project.new(:name => 'Copy Test', :identifier => 'copy-test')
|
||||
IssueQuery.generate!(:project => source, :visibility => Query::VISIBILITY_ROLES, :roles => Role.where(:id => [1, 3]).to_a)
|
||||
|
||||
assert target.copy(source)
|
||||
assert_equal 1, target.queries.size
|
||||
query = target.queries.first
|
||||
assert_equal [1, 3], query.role_ids.sort
|
||||
end
|
||||
|
||||
test "#copy should copy versions" do
|
||||
@source_project.versions << Version.generate!
|
||||
@source_project.versions << Version.generate!
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user