##// END OF EJS Templates
Merged r13334 (#17486)....
Jean-Philippe Lang -
r13026:5f184f9fd1da
parent child
Show More
@@ -1,126 +1,126
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2014 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 30
31 31 def role
32 32 end
33 33
34 34 def role=
35 35 end
36 36
37 37 def name
38 38 self.user.name
39 39 end
40 40
41 41 alias :base_role_ids= :role_ids=
42 42 def role_ids=(arg)
43 43 ids = (arg || []).collect(&:to_i) - [0]
44 44 # Keep inherited roles
45 45 ids += member_roles.select {|mr| !mr.inherited_from.nil?}.collect(&:role_id)
46 46
47 47 new_role_ids = ids - role_ids
48 48 # Add new roles
49 49 new_role_ids.each {|id| member_roles << MemberRole.new(:role_id => id) }
50 50 # Remove roles (Rails' #role_ids= will not trigger MemberRole#on_destroy)
51 51 member_roles_to_destroy = member_roles.select {|mr| !ids.include?(mr.role_id)}
52 52 if member_roles_to_destroy.any?
53 53 member_roles_to_destroy.each(&:destroy)
54 54 end
55 55 end
56 56
57 57 def <=>(member)
58 58 a, b = roles.sort.first, member.roles.sort.first
59 59 if a == b
60 60 if principal
61 61 principal <=> member.principal
62 62 else
63 63 1
64 64 end
65 65 elsif a
66 66 a <=> b
67 67 else
68 68 1
69 69 end
70 70 end
71 71
72 72 def deletable?
73 73 member_roles.detect {|mr| mr.inherited_from}.nil?
74 74 end
75 75
76 76 def destroy
77 77 if member_roles.reload.present?
78 78 # destroying the last role will destroy another instance
79 79 # of the same Member record, #super would then trigger callbacks twice
80 80 member_roles.destroy_all
81 81 @destroyed = true
82 82 freeze
83 83 else
84 84 super
85 85 end
86 86 end
87 87
88 88 def include?(user)
89 89 if principal.is_a?(Group)
90 90 !user.nil? && user.groups.include?(principal)
91 91 else
92 92 self.user == user
93 93 end
94 94 end
95 95
96 96 def set_issue_category_nil
97 if user
97 if user_id && project_id
98 98 # remove category based auto assignments for this member
99 IssueCategory.where(["project_id = ? AND assigned_to_id = ?", project.id, user.id]).
99 IssueCategory.where(["project_id = ? AND assigned_to_id = ?", project_id, user_id]).
100 100 update_all("assigned_to_id = NULL")
101 101 end
102 102 end
103 103
104 104 # Find or initilize a Member with an id, attributes, and for a Principal
105 105 def self.edit_membership(id, new_attributes, principal=nil)
106 106 @membership = id.present? ? Member.find(id) : Member.new(:principal => principal)
107 107 @membership.attributes = new_attributes
108 108 @membership
109 109 end
110 110
111 111 # Finds or initilizes a Member for the given project and principal
112 112 def self.find_or_new(project, principal)
113 113 project_id = project.is_a?(Project) ? project.id : project
114 114 principal_id = principal.is_a?(Principal) ? principal.id : principal
115 115
116 116 member = Member.find_by_project_id_and_user_id(project_id, principal_id)
117 117 member ||= Member.new(:project_id => project_id, :user_id => principal_id)
118 118 member
119 119 end
120 120
121 121 protected
122 122
123 123 def validate_role
124 124 errors.add_on_empty :role if member_roles.empty? && roles.empty?
125 125 end
126 126 end
@@ -1,143 +1,153
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2014 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 :groups_users,
29 29 :watchers,
30 30 :journals, :journal_details,
31 31 :messages,
32 32 :wikis, :wiki_pages, :wiki_contents, :wiki_content_versions,
33 33 :boards
34 34
35 35 include Redmine::I18n
36 36
37 37 def setup
38 38 @jsmith = Member.find(1)
39 39 end
40 40
41 41 def test_create
42 42 member = Member.new(:project_id => 1, :user_id => 4, :role_ids => [1, 2])
43 43 assert member.save
44 44 member.reload
45 45
46 46 assert_equal 2, member.roles.size
47 47 assert_equal Role.find(1), member.roles.sort.first
48 48 end
49 49
50 50 def test_update
51 51 assert_equal "eCookbook", @jsmith.project.name
52 52 assert_equal "Manager", @jsmith.roles.first.name
53 53 assert_equal "jsmith", @jsmith.user.login
54 54
55 55 @jsmith.mail_notification = !@jsmith.mail_notification
56 56 assert @jsmith.save
57 57 end
58 58
59 59 def test_update_roles
60 60 assert_equal 1, @jsmith.roles.size
61 61 @jsmith.role_ids = [1, 2]
62 62 assert @jsmith.save
63 63 assert_equal 2, @jsmith.reload.roles.size
64 64 end
65 65
66 66 def test_validate
67 67 member = Member.new(:project_id => 1, :user_id => 2, :role_ids => [2])
68 68 # same use can't have more than one membership for a project
69 69 assert !member.save
70 70
71 71 # must have one role at least
72 72 user = User.new(:firstname => "new1", :lastname => "user1",
73 73 :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",
89 89 :mail => "test_validate@somenet.foo")
90 90 user.login = "test_validate_member_role"
91 91 user.password, user.password_confirmation = "password", "password"
92 92 assert user.save
93 93 member = Member.new(:project_id => 1, :user_id => user.id, :role_ids => [5])
94 94 assert !member.save
95 95 end
96 96
97 def test_set_issue_category_nil_should_handle_nil_values
98 m = Member.new
99 assert_nil m.user
100 assert_nil m.project
101
102 assert_nothing_raised do
103 m.set_issue_category_nil
104 end
105 end
106
97 107 def test_destroy
98 108 category1 = IssueCategory.find(1)
99 109 assert_equal @jsmith.user.id, category1.assigned_to_id
100 110 assert_difference 'Member.count', -1 do
101 111 assert_difference 'MemberRole.count', -1 do
102 112 @jsmith.destroy
103 113 end
104 114 end
105 115 assert_raise(ActiveRecord::RecordNotFound) { Member.find(@jsmith.id) }
106 116 category1.reload
107 117 assert_nil category1.assigned_to_id
108 118 end
109 119
110 120 def test_destroy_should_trigger_callbacks_only_once
111 121 Member.class_eval { def destroy_test_callback; end}
112 122 Member.after_destroy :destroy_test_callback
113 123
114 124 m = Member.create!(:user_id => 1, :project_id => 1, :role_ids => [1,3])
115 125
116 126 Member.any_instance.expects(:destroy_test_callback).once
117 127 assert_difference 'Member.count', -1 do
118 128 assert_difference 'MemberRole.count', -2 do
119 129 m.destroy
120 130 end
121 131 end
122 132 assert m.destroyed?
123 133 ensure
124 134 Member._destroy_callbacks.reject! {|c| c.filter==:destroy_test_callback}
125 135 end
126 136
127 137 def test_sort_without_roles
128 138 a = Member.new(:roles => [Role.first])
129 139 b = Member.new
130 140
131 141 assert_equal -1, a <=> b
132 142 assert_equal 1, b <=> a
133 143 end
134 144
135 145 def test_sort_without_principal
136 146 role = Role.first
137 147 a = Member.new(:roles => [role], :principal => User.first)
138 148 b = Member.new(:roles => [role])
139 149
140 150 assert_equal -1, a <=> b
141 151 assert_equal 1, b <=> a
142 152 end
143 153 end
General Comments 0
You need to be logged in to leave comments. Login now