##// END OF EJS Templates
jro_apps » redmine
RSS
Fixed: Unrelated error message when creating a group with an invalid name (#9795)....
Jean-Philippe Lang -
r8111:4f5e7d678e5d
parent child
Show More
Side by Side Unified
Context file:
r8111:4f5e7d678e5d Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,62 +1,66
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 Group < Principal
19 19 has_and_belongs_to_many :users, :after_add => :user_added,
20 20 :after_remove => :user_removed
21 21
22 22 acts_as_customizable
23 23
24 24 validates_presence_of :lastname
25 25 validates_uniqueness_of :lastname, :case_sensitive => false
26 26 validates_length_of :lastname, :maximum => 30
27 27
28 28 before_destroy :remove_references_before_destroy
29 29
30 30 def to_s
31 31 lastname.to_s
32 32 end
33 33
34 34 alias :name :to_s
35 35
36 36 def user_added(user)
37 37 members.each do |member|
38 38 next if member.project.nil?
39 39 user_member = Member.find_by_project_id_and_user_id(member.project_id, user.id) || Member.new(:project_id => member.project_id, :user_id => user.id)
40 40 member.member_roles.each do |member_role|
41 41 user_member.member_roles << MemberRole.new(:role => member_role.role, :inherited_from => member_role.id)
42 42 end
43 43 user_member.save!
44 44 end
45 45 end
46 46
47 47 def user_removed(user)
48 48 members.each do |member|
49 49 MemberRole.find(:all, :include => :member,
50 50 :conditions => ["#{Member.table_name}.user_id = ? AND #{MemberRole.table_name}.inherited_from IN (?)", user.id, member.member_role_ids]).each(&:destroy)
51 51 end
52 52 end
53 53
54 def self.human_attribute_name(attribute_key_name, *args)
55 attribute_key_name == 'lastname' ? l(:field_name) : super
56 end
57
54 58 private
55 59
56 60 # Removes references that are not handled by associations
57 61 def remove_references_before_destroy
58 62 return if self.id.nil?
59 63
60 64 Issue.update_all 'assigned_to_id = NULL', ['assigned_to_id = ?', id]
61 65 end
62 66 end
Show file before | Show file after | Hide comments
@@ -1,95 +1,101
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 GroupTest < 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
31 31 def test_create
32 32 g = Group.new(:lastname => 'New group')
33 33 assert g.save
34 34 end
35 35
36 def test_blank_name_error_message
37 g = Group.new
38 assert !g.save
39 assert_include "Name can't be blank", g.errors.full_messages
40 end
41
36 42 def test_roles_given_to_new_user
37 43 group = Group.find(11)
38 44 user = User.find(9)
39 45 project = Project.first
40 46
41 47 Member.create!(:principal => group, :project => project, :role_ids => [1, 2])
42 48 group.users << user
43 49 assert user.member_of?(project)
44 50 end
45 51
46 52 def test_roles_given_to_existing_user
47 53 group = Group.find(11)
48 54 user = User.find(9)
49 55 project = Project.first
50 56
51 57 group.users << user
52 58 m = Member.create!(:principal => group, :project => project, :role_ids => [1, 2])
53 59 assert user.member_of?(project)
54 60 end
55 61
56 62 def test_roles_updated
57 63 group = Group.find(11)
58 64 user = User.find(9)
59 65 project = Project.first
60 66 group.users << user
61 67 m = Member.create!(:principal => group, :project => project, :role_ids => [1])
62 68 assert_equal [1], user.reload.roles_for_project(project).collect(&:id).sort
63 69
64 70 m.role_ids = [1, 2]
65 71 assert_equal [1, 2], user.reload.roles_for_project(project).collect(&:id).sort
66 72
67 73 m.role_ids = [2]
68 74 assert_equal [2], user.reload.roles_for_project(project).collect(&:id).sort
69 75
70 76 m.role_ids = [1]
71 77 assert_equal [1], user.reload.roles_for_project(project).collect(&:id).sort
72 78 end
73 79
74 80 def test_roles_removed_when_removing_group_membership
75 81 assert User.find(8).member_of?(Project.find(5))
76 82 Member.find_by_project_id_and_user_id(5, 10).destroy
77 83 assert !User.find(8).member_of?(Project.find(5))
78 84 end
79 85
80 86 def test_roles_removed_when_removing_user_from_group
81 87 assert User.find(8).member_of?(Project.find(5))
82 88 User.find(8).groups.clear
83 89 assert !User.find(8).member_of?(Project.find(5))
84 90 end
85 91
86 92 def test_destroy_should_unassign_issues
87 93 group = Group.first
88 94 Issue.update_all(["assigned_to_id = ?", group.id], 'id = 1')
89 95
90 96 assert group.destroy
91 97 assert group.destroyed?
92 98
93 99 assert_equal nil, Issue.find(1).assigned_to_id
94 100 end
95 101 end
General Comments 0
You need to be logged in to leave comments. Login now