##// END OF EJS Templates
jro_apps » redmine
RSS
Merged r8863 from trunk....
Jean-Philippe Lang -
r8992:92dde0d75f33
parent child
Show More
Side by Side Unified
Context file:
r8992:92dde0d75f33 Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,96 +1,106
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2011 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
28 28 after_destroy :unwatch_from_permission_change
29 29
30 30 def name
31 31 self.user.name
32 32 end
33 33
34 34 alias :base_role_ids= :role_ids=
35 35 def role_ids=(arg)
36 36 ids = (arg || []).collect(&:to_i) - [0]
37 37 # Keep inherited roles
38 38 ids += member_roles.select {|mr| !mr.inherited_from.nil?}.collect(&:role_id)
39 39
40 40 new_role_ids = ids - role_ids
41 41 # Add new roles
42 42 new_role_ids.each {|id| member_roles << MemberRole.new(:role_id => id) }
43 43 # Remove roles (Rails' #role_ids= will not trigger MemberRole#on_destroy)
44 44 member_roles_to_destroy = member_roles.select {|mr| !ids.include?(mr.role_id)}
45 45 if member_roles_to_destroy.any?
46 46 member_roles_to_destroy.each(&:destroy)
47 47 unwatch_from_permission_change
48 48 end
49 49 end
50 50
51 51 def <=>(member)
52 52 a, b = roles.sort.first, member.roles.sort.first
53 a == b ? (principal <=> member.principal) : (a <=> b)
53 if a == b
54 if principal
55 principal <=> member.principal
56 else
57 1
58 end
59 elsif a
60 a <=> b
61 else
62 1
63 end
54 64 end
55 65
56 66 def deletable?
57 67 member_roles.detect {|mr| mr.inherited_from}.nil?
58 68 end
59 69
60 70 def include?(user)
61 71 if principal.is_a?(Group)
62 72 !user.nil? && user.groups.include?(principal)
63 73 else
64 74 self.user == user
65 75 end
66 76 end
67 77
68 78 def before_destroy
69 79 if user
70 80 # remove category based auto assignments for this member
71 81 IssueCategory.update_all "assigned_to_id = NULL", ["project_id = ? AND assigned_to_id = ?", project.id, user.id]
72 82 end
73 83 end
74 84
75 85 # Find or initilize a Member with an id, attributes, and for a Principal
76 86 def self.edit_membership(id, new_attributes, principal=nil)
77 87 @membership = id.present? ? Member.find(id) : Member.new(:principal => principal)
78 88 @membership.attributes = new_attributes
79 89 @membership
80 90 end
81 91
82 92 protected
83 93
84 94 def validate
85 95 errors.add_on_empty :role if member_roles.empty? && roles.empty?
86 96 end
87 97
88 98 private
89 99
90 100 # Unwatch things that the user is no longer allowed to view inside project
91 101 def unwatch_from_permission_change
92 102 if user
93 103 Watcher.prune(:user => user, :project => project)
94 104 end
95 105 end
96 106 end
Show file before | Show file after | Hide comments
@@ -1,62 +1,64
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2011 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 Principal < ActiveRecord::Base
19 19 set_table_name "#{table_name_prefix}users#{table_name_suffix}"
20 20
21 21 has_many :members, :foreign_key => 'user_id', :dependent => :destroy
22 22 has_many :memberships, :class_name => 'Member', :foreign_key => 'user_id', :include => [ :project, :roles ], :conditions => "#{Project.table_name}.status=#{Project::STATUS_ACTIVE}", :order => "#{Project.table_name}.name"
23 23 has_many :projects, :through => :memberships
24 24 has_many :issue_categories, :foreign_key => 'assigned_to_id', :dependent => :nullify
25 25
26 26 # Groups and active users
27 27 named_scope :active, :conditions => "#{Principal.table_name}.type='Group' OR (#{Principal.table_name}.type='User' AND #{Principal.table_name}.status = 1)"
28 28
29 29 named_scope :like, lambda {|q|
30 30 s = "%#{q.to_s.strip.downcase}%"
31 31 {:conditions => ["LOWER(login) LIKE :s OR LOWER(firstname) LIKE :s OR LOWER(lastname) LIKE :s OR LOWER(mail) LIKE :s", {:s => s}],
32 32 :order => 'type, login, lastname, firstname, mail'
33 33 }
34 34 }
35 35
36 36 before_create :set_default_empty_values
37 37
38 38 def name(formatter = nil)
39 39 to_s
40 40 end
41 41
42 42 def <=>(principal)
43 if self.class.name == principal.class.name
43 if principal.nil?
44 -1
45 elsif self.class.name == principal.class.name
44 46 self.to_s.downcase <=> principal.to_s.downcase
45 47 else
46 48 # groups after users
47 49 principal.class.name <=> self.class.name
48 50 end
49 51 end
50 52
51 53 protected
52 54
53 55 # Make sure we don't try to insert NULL values (see #4632)
54 56 def set_default_empty_values
55 57 self.login ||= ''
56 58 self.hashed_password ||= ''
57 59 self.firstname ||= ''
58 60 self.lastname ||= ''
59 61 self.mail ||= ''
60 62 true
61 63 end
62 64 end
Show file before | Show file after | Hide comments
@@ -1,150 +1,167
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2011 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 def setup
37 37 @jsmith = Member.find(1)
38 38 end
39 39
40 40 def test_create
41 41 member = Member.new(:project_id => 1, :user_id => 4, :role_ids => [1, 2])
42 42 assert member.save
43 43 member.reload
44 44
45 45 assert_equal 2, member.roles.size
46 46 assert_equal Role.find(1), member.roles.sort.first
47 47 end
48 48
49 49 def test_update
50 50 assert_equal "eCookbook", @jsmith.project.name
51 51 assert_equal "Manager", @jsmith.roles.first.name
52 52 assert_equal "jsmith", @jsmith.user.login
53 53
54 54 @jsmith.mail_notification = !@jsmith.mail_notification
55 55 assert @jsmith.save
56 56 end
57 57
58 58 def test_update_roles
59 59 assert_equal 1, @jsmith.roles.size
60 60 @jsmith.role_ids = [1, 2]
61 61 assert @jsmith.save
62 62 assert_equal 2, @jsmith.reload.roles.size
63 63 end
64 64
65 65 def test_validate
66 66 member = Member.new(:project_id => 1, :user_id => 2, :role_ids => [2])
67 67 # same use can't have more than one membership for a project
68 68 assert !member.save
69 69
70 70 member = Member.new(:project_id => 1, :user_id => 2, :role_ids => [])
71 71 # must have one role at least
72 72 assert !member.save
73 73 end
74 74
75 75 def test_destroy
76 76 assert_difference 'Member.count', -1 do
77 77 assert_difference 'MemberRole.count', -1 do
78 78 @jsmith.destroy
79 79 end
80 80 end
81 81
82 82 assert_raise(ActiveRecord::RecordNotFound) { Member.find(@jsmith.id) }
83 83 end
84 84
85 def test_sort_without_roles
86 a = Member.new(:roles => [Role.first])
87 b = Member.new
88
89 assert_equal -1, a <=> b
90 assert_equal 1, b <=> a
91 end
92
93 def test_sort_without_principal
94 role = Role.first
95 a = Member.new(:roles => [role], :principal => User.first)
96 b = Member.new(:roles => [role])
97
98 assert_equal -1, a <=> b
99 assert_equal 1, b <=> a
100 end
101
85 102 context "removing permissions" do
86 103 setup do
87 104 Watcher.delete_all("user_id = 9")
88 105 user = User.find(9)
89 106 # public
90 107 Watcher.create!(:watchable => Issue.find(1), :user => user)
91 108 # private
92 109 Watcher.create!(:watchable => Issue.find(4), :user => user)
93 110 Watcher.create!(:watchable => Message.find(7), :user => user)
94 111 Watcher.create!(:watchable => Wiki.find(2), :user => user)
95 112 Watcher.create!(:watchable => WikiPage.find(3), :user => user)
96 113 end
97 114
98 115 context "of user" do
99 116 setup do
100 117 @member = Member.create!(:project => Project.find(2), :principal => User.find(9), :role_ids => [1, 2])
101 118 end
102 119
103 120 context "by deleting membership" do
104 121 should "prune watchers" do
105 122 assert_difference 'Watcher.count', -4 do
106 123 @member.destroy
107 124 end
108 125 end
109 126 end
110 127
111 128 context "by updating roles" do
112 129 should "prune watchers" do
113 130 Role.find(2).remove_permission! :view_wiki_pages
114 131 member = Member.first(:order => 'id desc')
115 132 assert_difference 'Watcher.count', -2 do
116 133 member.role_ids = [2]
117 134 member.save
118 135 end
119 136 assert !Message.find(7).watched_by?(@user)
120 137 end
121 138 end
122 139 end
123 140
124 141 context "of group" do
125 142 setup do
126 143 group = Group.find(10)
127 144 @member = Member.create!(:project => Project.find(2), :principal => group, :role_ids => [1, 2])
128 145 group.users << User.find(9)
129 146 end
130 147
131 148 context "by deleting membership" do
132 149 should "prune watchers" do
133 150 assert_difference 'Watcher.count', -4 do
134 151 @member.destroy
135 152 end
136 153 end
137 154 end
138 155
139 156 context "by updating roles" do
140 157 should "prune watchers" do
141 158 Role.find(2).remove_permission! :view_wiki_pages
142 159 assert_difference 'Watcher.count', -2 do
143 160 @member.role_ids = [2]
144 161 @member.save
145 162 end
146 163 end
147 164 end
148 165 end
149 166 end
150 167 end
General Comments 0
You need to be logged in to leave comments. Login now