@@ -109,6 +109,7 class Role < ActiveRecord::Base | |||||
109 | role = arg.is_a?(Role) ? arg : Role.find_by_id(arg.to_s) |
|
109 | role = arg.is_a?(Role) ? arg : Role.find_by_id(arg.to_s) | |
110 | self.attributes = role.attributes.dup.except("id", "name", "position", "builtin", "permissions") |
|
110 | self.attributes = role.attributes.dup.except("id", "name", "position", "builtin", "permissions") | |
111 | self.permissions = role.permissions.dup |
|
111 | self.permissions = role.permissions.dup | |
|
112 | self.managed_role_ids = role.managed_role_ids.dup | |||
112 | self |
|
113 | self | |
113 | end |
|
114 | end | |
114 |
|
115 |
@@ -129,7 +129,7 class RolesControllerTest < Redmine::ControllerTest | |||||
129 | assert_response 302 |
|
129 | assert_response 302 | |
130 | end |
|
130 | end | |
131 | assert_equal false, role.all_roles_managed |
|
131 | assert_equal false, role.all_roles_managed | |
132 | assert_equal [2, 3], role.managed_role_ids |
|
132 | assert_equal [2, 3], role.managed_role_ids.sort | |
133 | end |
|
133 | end | |
134 |
|
134 | |||
135 | def test_edit |
|
135 | def test_edit |
@@ -45,6 +45,13 class RoleTest < ActiveSupport::TestCase | |||||
45 | assert copy.save |
|
45 | assert copy.save | |
46 | end |
|
46 | end | |
47 |
|
47 | |||
|
48 | def test_copy_from_should_copy_managed_roles | |||
|
49 | orig = Role.generate!(:all_roles_managed => false, :managed_role_ids => [2, 3]) | |||
|
50 | role = Role.new | |||
|
51 | role.copy_from orig | |||
|
52 | assert_equal [2, 3], role.managed_role_ids.sort | |||
|
53 | end | |||
|
54 | ||||
48 | def test_copy_workflows |
|
55 | def test_copy_workflows | |
49 | source = Role.find(1) |
|
56 | source = Role.find(1) | |
50 | rule_count = source.workflow_rules.count |
|
57 | rule_count = source.workflow_rules.count |
General Comments 0
You need to be logged in to leave comments.
Login now