##// END OF EJS Templates
jro_apps » redmine
RSS
Don't remove watchers on permission change....
Jean-Philippe Lang -
r11070:5fea79504c74
parent child
Show More
Side by Side Unified
Context file:
r11070:5fea79504c74 Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,124 +1,113
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2013 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 class Member < ActiveRecord::Base
19 19 belongs_to :user
20 20 belongs_to :principal, :foreign_key => 'user_id'
21 21 has_many :member_roles, :dependent => :destroy
22 22 has_many :roles, :through => :member_roles
23 23 belongs_to :project
24 24
25 25 validates_presence_of :principal, :project
26 26 validates_uniqueness_of :user_id, :scope => :project_id
27 27 validate :validate_role
28 28
29 29 before_destroy :set_issue_category_nil
30 after_destroy :unwatch_from_permission_change
31 30
32 31 def role
33 32 end
34 33
35 34 def role=
36 35 end
37 36
38 37 def name
39 38 self.user.name
40 39 end
41 40
42 41 alias :base_role_ids= :role_ids=
43 42 def role_ids=(arg)
44 43 ids = (arg || []).collect(&:to_i) - [0]
45 44 # Keep inherited roles
46 45 ids += member_roles.select {|mr| !mr.inherited_from.nil?}.collect(&:role_id)
47 46
48 47 new_role_ids = ids - role_ids
49 48 # Add new roles
50 49 new_role_ids.each {|id| member_roles << MemberRole.new(:role_id => id) }
51 50 # Remove roles (Rails' #role_ids= will not trigger MemberRole#on_destroy)
52 51 member_roles_to_destroy = member_roles.select {|mr| !ids.include?(mr.role_id)}
53 52 if member_roles_to_destroy.any?
54 53 member_roles_to_destroy.each(&:destroy)
55 unwatch_from_permission_change
56 54 end
57 55 end
58 56
59 57 def <=>(member)
60 58 a, b = roles.sort.first, member.roles.sort.first
61 59 if a == b
62 60 if principal
63 61 principal <=> member.principal
64 62 else
65 63 1
66 64 end
67 65 elsif a
68 66 a <=> b
69 67 else
70 68 1
71 69 end
72 70 end
73 71
74 72 def deletable?
75 73 member_roles.detect {|mr| mr.inherited_from}.nil?
76 74 end
77 75
78 76 def include?(user)
79 77 if principal.is_a?(Group)
80 78 !user.nil? && user.groups.include?(principal)
81 79 else
82 80 self.user == user
83 81 end
84 82 end
85 83
86 84 def set_issue_category_nil
87 85 if user
88 86 # remove category based auto assignments for this member
89 87 IssueCategory.update_all "assigned_to_id = NULL", ["project_id = ? AND assigned_to_id = ?", project.id, user.id]
90 88 end
91 89 end
92 90
93 91 # Find or initilize a Member with an id, attributes, and for a Principal
94 92 def self.edit_membership(id, new_attributes, principal=nil)
95 93 @membership = id.present? ? Member.find(id) : Member.new(:principal => principal)
96 94 @membership.attributes = new_attributes
97 95 @membership
98 96 end
99 97
100 98 # Finds or initilizes a Member for the given project and principal
101 99 def self.find_or_new(project, principal)
102 100 project_id = project.is_a?(Project) ? project.id : project
103 101 principal_id = principal.is_a?(Principal) ? principal.id : principal
104 102
105 103 member = Member.find_by_project_id_and_user_id(project_id, principal_id)
106 104 member ||= Member.new(:project_id => project_id, :user_id => principal_id)
107 105 member
108 106 end
109 107
110 108 protected
111 109
112 110 def validate_role
113 111 errors.add_on_empty :role if member_roles.empty? && roles.empty?
114 112 end
115
116 private
117
118 # Unwatch things that the user is no longer allowed to view inside project
119 def unwatch_from_permission_change
120 if user
121 Watcher.prune(:user => user, :project => project)
122 end
123 end
124 113 end
Show file before | Show file after | Hide comments
@@ -1,74 +1,71
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2013 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 class MemberRole < ActiveRecord::Base
19 19 belongs_to :member
20 20 belongs_to :role
21 21
22 22 after_destroy :remove_member_if_empty
23 23
24 24 after_create :add_role_to_group_users, :add_role_to_subprojects
25 25 after_destroy :remove_inherited_roles
26 26
27 27 validates_presence_of :role
28 28 validate :validate_role_member
29 29
30 30 def validate_role_member
31 31 errors.add :role_id, :invalid if role && !role.member?
32 32 end
33 33
34 34 def inherited?
35 35 !inherited_from.nil?
36 36 end
37 37
38 38 private
39 39
40 40 def remove_member_if_empty
41 41 if member.roles.empty?
42 42 member.destroy
43 43 end
44 44 end
45 45
46 46 def add_role_to_group_users
47 47 if member.principal.is_a?(Group) && !inherited?
48 48 member.principal.users.each do |user|
49 49 user_member = Member.find_or_new(member.project_id, user.id)
50 50 user_member.member_roles << MemberRole.new(:role => role, :inherited_from => id)
51 51 user_member.save!
52 52 end
53 53 end
54 54 end
55 55
56 56 def add_role_to_subprojects
57 57 member.project.children.each do |subproject|
58 58 if subproject.inherit_members?
59 59 child_member = Member.find_or_new(subproject.id, member.user_id)
60 60 child_member.member_roles << MemberRole.new(:role => role, :inherited_from => id)
61 61 child_member.save!
62 62 end
63 63 end
64 64 end
65 65
66 66 def remove_inherited_roles
67 67 MemberRole.where(:inherited_from => id).all.group_by(&:member).each do |member, member_roles|
68 68 member_roles.each(&:destroy)
69 if member && member.user
70 Watcher.prune(:user => member.user, :project => member.project)
71 end
72 69 end
73 70 end
74 71 end
Show file before | Show file after | Hide comments
@@ -1,191 +1,125
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2013 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 require File.expand_path('../../test_helper', __FILE__)
19 19
20 20 class MemberTest < ActiveSupport::TestCase
21 21 fixtures :projects, :trackers, :issue_statuses, :issues,
22 22 :enumerations, :users, :issue_categories,
23 23 :projects_trackers,
24 24 :roles,
25 25 :member_roles,
26 26 :members,
27 27 :enabled_modules,
28 28 :workflows,
29 29 :groups_users,
30 30 :watchers,
31 31 :journals, :journal_details,
32 32 :messages,
33 33 :wikis, :wiki_pages, :wiki_contents, :wiki_content_versions,
34 34 :boards
35 35
36 36 include Redmine::I18n
37 37
38 38 def setup
39 39 @jsmith = Member.find(1)
40 40 end
41 41
42 42 def test_create
43 43 member = Member.new(:project_id => 1, :user_id => 4, :role_ids => [1, 2])
44 44 assert member.save
45 45 member.reload
46 46
47 47 assert_equal 2, member.roles.size
48 48 assert_equal Role.find(1), member.roles.sort.first
49 49 end
50 50
51 51 def test_update
52 52 assert_equal "eCookbook", @jsmith.project.name
53 53 assert_equal "Manager", @jsmith.roles.first.name
54 54 assert_equal "jsmith", @jsmith.user.login
55 55
56 56 @jsmith.mail_notification = !@jsmith.mail_notification
57 57 assert @jsmith.save
58 58 end
59 59
60 60 def test_update_roles
61 61 assert_equal 1, @jsmith.roles.size
62 62 @jsmith.role_ids = [1, 2]
63 63 assert @jsmith.save
64 64 assert_equal 2, @jsmith.reload.roles.size
65 65 end
66 66
67 67 def test_validate
68 68 member = Member.new(:project_id => 1, :user_id => 2, :role_ids => [2])
69 69 # same use can't have more than one membership for a project
70 70 assert !member.save
71 71
72 72 # must have one role at least
73 73 user = User.new(:firstname => "new1", :lastname => "user1", :mail => "test_validate@somenet.foo")
74 74 user.login = "test_validate"
75 75 user.password, user.password_confirmation = "password", "password"
76 76 assert user.save
77 77
78 78 set_language_if_valid 'fr'
79 79 member = Member.new(:project_id => 1, :user_id => user.id, :role_ids => [])
80 80 assert !member.save
81 81 assert_include I18n.translate('activerecord.errors.messages.empty'), member.errors[:role]
82 82 str = "R\xc3\xb4le doit \xc3\xaatre renseign\xc3\xa9(e)"
83 83 str.force_encoding('UTF-8') if str.respond_to?(:force_encoding)
84 84 assert_equal str, [member.errors.full_messages].flatten.join
85 85 end
86 86
87 87 def test_validate_member_role
88 88 user = User.new(:firstname => "new1", :lastname => "user1", :mail => "test_validate@somenet.foo")
89 89 user.login = "test_validate_member_role"
90 90 user.password, user.password_confirmation = "password", "password"
91 91 assert user.save
92 92 member = Member.new(:project_id => 1, :user_id => user.id, :role_ids => [5])
93 93 assert !member.save
94 94 end
95 95
96 96 def test_destroy
97 97 category1 = IssueCategory.find(1)
98 98 assert_equal @jsmith.user.id, category1.assigned_to_id
99 99 assert_difference 'Member.count', -1 do
100 100 assert_difference 'MemberRole.count', -1 do
101 101 @jsmith.destroy
102 102 end
103 103 end
104 104 assert_raise(ActiveRecord::RecordNotFound) { Member.find(@jsmith.id) }
105 105 category1.reload
106 106 assert_nil category1.assigned_to_id
107 107 end
108 108
109 109 def test_sort_without_roles
110 110 a = Member.new(:roles => [Role.first])
111 111 b = Member.new
112 112
113 113 assert_equal -1, a <=> b
114 114 assert_equal 1, b <=> a
115 115 end
116 116
117 117 def test_sort_without_principal
118 118 role = Role.first
119 119 a = Member.new(:roles => [role], :principal => User.first)
120 120 b = Member.new(:roles => [role])
121 121
122 122 assert_equal -1, a <=> b
123 123 assert_equal 1, b <=> a
124 124 end
125
126 context "removing permissions" do
127 setup do
128 Watcher.delete_all("user_id = 9")
129 user = User.find(9)
130 # public
131 Watcher.create!(:watchable => Issue.find(1), :user => user)
132 # private
133 Watcher.create!(:watchable => Issue.find(4), :user => user)
134 Watcher.create!(:watchable => Message.find(7), :user => user)
135 Watcher.create!(:watchable => Wiki.find(2), :user => user)
136 Watcher.create!(:watchable => WikiPage.find(3), :user => user)
137 end
138
139 context "of user" do
140 setup do
141 @member = Member.create!(:project => Project.find(2), :principal => User.find(9), :role_ids => [1, 2])
142 end
143
144 context "by deleting membership" do
145 should "prune watchers" do
146 assert_difference 'Watcher.count', -4 do
147 @member.destroy
148 end
149 end
150 end
151
152 context "by updating roles" do
153 should "prune watchers" do
154 Role.find(2).remove_permission! :view_wiki_pages
155 member = Member.first(:order => 'id desc')
156 assert_difference 'Watcher.count', -2 do
157 member.role_ids = [2]
158 member.save
159 end
160 assert !Message.find(7).watched_by?(@user)
161 end
162 end
163 end
164
165 context "of group" do
166 setup do
167 group = Group.find(10)
168 @member = Member.create!(:project => Project.find(2), :principal => group, :role_ids => [1, 2])
169 group.users << User.find(9)
170 end
171
172 context "by deleting membership" do
173 should "prune watchers" do
174 assert_difference 'Watcher.count', -4 do
175 @member.destroy
176 end
177 end
178 end
179
180 context "by updating roles" do
181 should "prune watchers" do
182 Role.find(2).remove_permission! :view_wiki_pages
183 assert_difference 'Watcher.count', -2 do
184 @member.role_ids = [2]
185 @member.save
186 end
187 end
188 end
189 end
190 end
191 125 end
General Comments 0
You need to be logged in to leave comments. Login now