##// END OF EJS Templates
jro_apps » redmine
RSS
Replaced group[lastname] parameter with group[name]....
Jean-Philippe Lang -
r9562:733fef458c5c
parent child
Show More
Side by Side Unified
Context file:
r9562:733fef458c5c Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,70 +1,76
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2012 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 alias :name :to_s
34 def name
35 lastname
36 end
37
38 def name=(arg)
39 self.lastname = arg
40 end
35 41
36 42 def user_added(user)
37 43 members.each do |member|
38 44 next if member.project.nil?
39 45 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 46 member.member_roles.each do |member_role|
41 47 user_member.member_roles << MemberRole.new(:role => member_role.role, :inherited_from => member_role.id)
42 48 end
43 49 user_member.save!
44 50 end
45 51 end
46 52
47 53 def user_removed(user)
48 54 members.each do |member|
49 55 MemberRole.find(:all, :include => :member,
50 56 :conditions => ["#{Member.table_name}.user_id = ? AND #{MemberRole.table_name}.inherited_from IN (?)", user.id, member.member_role_ids]).each(&:destroy)
51 57 end
52 58 end
53 59
54 60 def self.human_attribute_name(attribute_key_name, *args)
55 61 attr_name = attribute_key_name.to_s
56 62 if attr_name == 'lastname'
57 63 attr_name = "name"
58 64 end
59 65 super(attr_name, *args)
60 66 end
61 67
62 68 private
63 69
64 70 # Removes references that are not handled by associations
65 71 def remove_references_before_destroy
66 72 return if self.id.nil?
67 73
68 74 Issue.update_all 'assigned_to_id = NULL', ['assigned_to_id = ?', id]
69 75 end
70 76 end
Show file before | Show file after | Hide comments
@@ -1,8 +1,8
1 1 <%= error_messages_for @group %>
2 2
3 3 <div class="box tabular">
4 <p><%= f.text_field :lastname, :label => :field_name %></p>
4 <p><%= f.text_field :name %></p>
5 5 <% @group.custom_field_values.each do |value| %>
6 6 <p><%= custom_field_tag_with_label :group, value %></p>
7 7 <% end %>
8 8 </div>
Show file before | Show file after | Hide comments
@@ -1,174 +1,175
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2012 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 GroupsControllerTest < ActionController::TestCase
21 21 fixtures :projects, :users, :members, :member_roles, :groups_users
22 22
23 23 def setup
24 24 @request.session[:user_id] = 1
25 25 end
26 26
27 27 def test_index
28 28 get :index
29 29 assert_response :success
30 30 assert_template 'index'
31 31 end
32 32
33 33 def test_show
34 34 get :show, :id => 10
35 35 assert_response :success
36 36 assert_template 'show'
37 37 end
38 38
39 39 def test_new
40 40 get :new
41 41 assert_response :success
42 42 assert_template 'new'
43 assert_select 'input[name=?]', 'group[name]'
43 44 end
44 45
45 46 def test_create
46 47 assert_difference 'Group.count' do
47 post :create, :group => {:lastname => 'New group'}
48 post :create, :group => {:name => 'New group'}
48 49 end
49 50 assert_redirected_to '/groups'
50 51 group = Group.first(:order => 'id DESC')
51 52 assert_equal 'New group', group.name
52 53 assert_equal [], group.users
53 54 end
54 55
55 56 def test_create_and_continue
56 57 assert_difference 'Group.count' do
57 post :create, :group => {:lastname => 'New group'}, :continue => 'Create and continue'
58 post :create, :group => {:name => 'New group'}, :continue => 'Create and continue'
58 59 end
59 60 assert_redirected_to '/groups/new'
60 61 group = Group.first(:order => 'id DESC')
61 62 assert_equal 'New group', group.name
62 63 end
63 64
64 65 def test_create_with_failure
65 66 assert_no_difference 'Group.count' do
66 post :create, :group => {:lastname => ''}
67 post :create, :group => {:name => ''}
67 68 end
68 69 assert_response :success
69 70 assert_template 'new'
70 71 end
71 72
72 73 def test_edit
73 74 get :edit, :id => 10
74 75 assert_response :success
75 76 assert_template 'edit'
76 77 assert_tag 'div', :attributes => {:id => 'tab-content-users'}
77 78 assert_tag 'div', :attributes => {:id => 'tab-content-memberships'}
78 79 end
79 80
80 81 def test_update
81 82 new_name = 'New name'
82 put :update, :id => 10, :group => {:lastname => new_name}
83 put :update, :id => 10, :group => {:name => new_name}
83 84 assert_redirected_to '/groups'
84 85 group = Group.find(10)
85 86 assert_equal new_name, group.name
86 87 end
87 88
88 89 def test_update_with_failure
89 put :update, :id => 10, :group => {:lastname => ''}
90 put :update, :id => 10, :group => {:name => ''}
90 91 assert_response :success
91 92 assert_template 'edit'
92 93 end
93 94
94 95 def test_destroy
95 96 assert_difference 'Group.count', -1 do
96 97 post :destroy, :id => 10
97 98 end
98 99 assert_redirected_to '/groups'
99 100 end
100 101
101 102 def test_add_users
102 103 assert_difference 'Group.find(10).users.count', 2 do
103 104 post :add_users, :id => 10, :user_ids => ['2', '3']
104 105 end
105 106 end
106 107
107 108 def test_xhr_add_users
108 109 assert_difference 'Group.find(10).users.count', 2 do
109 110 xhr :post, :add_users, :id => 10, :user_ids => ['2', '3']
110 111 end
111 112 assert_select_rjs :replace_html, 'tab-content-users'
112 113 end
113 114
114 115 def test_remove_user
115 116 assert_difference 'Group.find(10).users.count', -1 do
116 117 delete :remove_user, :id => 10, :user_id => '8'
117 118 end
118 119 end
119 120
120 121 def test_xhr_remove_user
121 122 assert_difference 'Group.find(10).users.count', -1 do
122 123 xhr :delete, :remove_user, :id => 10, :user_id => '8'
123 124 end
124 125 assert_select_rjs :replace_html, 'tab-content-users'
125 126 end
126 127
127 128 def test_new_membership
128 129 assert_difference 'Group.find(10).members.count' do
129 130 post :edit_membership, :id => 10, :membership => { :project_id => 2, :role_ids => ['1', '2']}
130 131 end
131 132 end
132 133
133 134 def test_xhr_new_membership
134 135 assert_difference 'Group.find(10).members.count' do
135 136 xhr :post, :edit_membership, :id => 10, :membership => { :project_id => 2, :role_ids => ['1', '2']}
136 137 end
137 138 assert_select_rjs :replace_html, 'tab-content-memberships'
138 139 end
139 140
140 141 def test_xhr_new_membership_with_failure
141 142 assert_no_difference 'Group.find(10).members.count' do
142 143 xhr :post, :edit_membership, :id => 10, :membership => { :project_id => 999, :role_ids => ['1', '2']}
143 144 end
144 145 assert @response.body.match(/alert/i), "Alert message not sent"
145 146 end
146 147
147 148 def test_edit_membership
148 149 assert_no_difference 'Group.find(10).members.count' do
149 150 post :edit_membership, :id => 10, :membership_id => 6, :membership => { :role_ids => ['1', '3']}
150 151 end
151 152 end
152 153
153 154 def test_destroy_membership
154 155 assert_difference 'Group.find(10).members.count', -1 do
155 156 post :destroy_membership, :id => 10, :membership_id => 6
156 157 end
157 158 end
158 159
159 160 def test_xhr_destroy_membership
160 161 assert_difference 'Group.find(10).members.count', -1 do
161 162 xhr :post, :destroy_membership, :id => 10, :membership_id => 6
162 163 end
163 164 assert_select_rjs :replace_html, 'tab-content-memberships'
164 165 end
165 166
166 167 def test_autocomplete_for_user
167 168 get :autocomplete_for_user, :id => 10, :q => 'mis'
168 169 assert_response :success
169 170 users = assigns(:users)
170 171 assert_not_nil users
171 172 assert users.any?
172 173 assert !users.include?(Group.find(10).users.first)
173 174 end
174 175 end
Show file before | Show file after | Hide comments
@@ -1,102 +1,102
1 1 module ObjectHelpers
2 2 def User.generate!(attributes={})
3 3 @generated_user_login ||= 'user0'
4 4 @generated_user_login.succ!
5 5 user = User.new(attributes)
6 6 user.login = @generated_user_login if user.login.blank?
7 7 user.mail = "#{@generated_user_login}@example.com" if user.mail.blank?
8 8 user.firstname = "Bob" if user.firstname.blank?
9 9 user.lastname = "Doe" if user.lastname.blank?
10 10 yield user if block_given?
11 11 user.save!
12 12 user
13 13 end
14 14
15 15 def User.add_to_project(user, project, roles)
16 16 roles = [roles] unless roles.is_a?(Array)
17 17 Member.create!(:principal => user, :project => project, :roles => roles)
18 18 end
19 19
20 20 def Group.generate!(attributes={})
21 21 @generated_group_name ||= 'Group 0'
22 22 @generated_group_name.succ!
23 23 group = Group.new(attributes)
24 group.lastname = @generated_group_name if group.lastname.blank?
24 group.name = @generated_group_name if group.name.blank?
25 25 yield group if block_given?
26 26 group.save!
27 27 group
28 28 end
29 29
30 30 def Project.generate!(attributes={})
31 31 @generated_project_identifier ||= 'project-0000'
32 32 @generated_project_identifier.succ!
33 33 project = Project.new(attributes)
34 34 project.name = @generated_project_identifier if project.name.blank?
35 35 project.identifier = @generated_project_identifier if project.identifier.blank?
36 36 yield project if block_given?
37 37 project.save!
38 38 project
39 39 end
40 40
41 41 def Tracker.generate!(attributes={})
42 42 @generated_tracker_name ||= 'Tracker 0'
43 43 @generated_tracker_name.succ!
44 44 tracker = Tracker.new(attributes)
45 45 tracker.name = @generated_tracker_name if tracker.name.blank?
46 46 yield tracker if block_given?
47 47 tracker.save!
48 48 tracker
49 49 end
50 50
51 51 def Role.generate!(attributes={})
52 52 @generated_role_name ||= 'Role 0'
53 53 @generated_role_name.succ!
54 54 role = Role.new(attributes)
55 55 role.name = @generated_role_name if role.name.blank?
56 56 yield role if block_given?
57 57 role.save!
58 58 role
59 59 end
60 60
61 61 def Issue.generate!(attributes={})
62 62 issue = Issue.new(attributes)
63 63 issue.subject = 'Generated' if issue.subject.blank?
64 64 issue.author ||= User.find(2)
65 65 yield issue if block_given?
66 66 issue.save!
67 67 issue
68 68 end
69 69
70 70 # Generate an issue for a project, using its trackers
71 71 def Issue.generate_for_project!(project, attributes={})
72 72 issue = Issue.new(attributes) do |issue|
73 73 issue.project = project
74 74 issue.tracker = project.trackers.first unless project.trackers.empty?
75 75 issue.subject = 'Generated' if issue.subject.blank?
76 76 issue.author ||= User.find(2)
77 77 yield issue if block_given?
78 78 end
79 79 issue.save!
80 80 issue
81 81 end
82 82
83 83 def Version.generate!(attributes={})
84 84 @generated_version_name ||= 'Version 0'
85 85 @generated_version_name.succ!
86 86 version = Version.new(attributes)
87 87 version.name = @generated_version_name if version.name.blank?
88 88 yield version if block_given?
89 89 version.save!
90 90 version
91 91 end
92 92
93 93 def AuthSource.generate!(attributes={})
94 94 @generated_auth_source_name ||= 'Auth 0'
95 95 @generated_auth_source_name.succ!
96 96 source = AuthSource.new(attributes)
97 97 source.name = @generated_auth_source_name if source.name.blank?
98 98 yield source if block_given?
99 99 source.save!
100 100 source
101 101 end
102 102 end
Show file before | Show file after | Hide comments
@@ -1,113 +1,115
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2012 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 include Redmine::I18n
32 32
33 33 def test_create
34 g = Group.new(:lastname => 'New group')
34 g = Group.new(:name => 'New group')
35 35 assert g.save
36 g.reload
37 assert_equal 'New group', g.name
36 38 end
37 39
38 40 def test_blank_name_error_message
39 41 set_language_if_valid 'en'
40 42 g = Group.new
41 43 assert !g.save
42 44 assert_include "Name can't be blank", g.errors.full_messages
43 45 end
44 46
45 47 def test_blank_name_error_message_fr
46 48 set_language_if_valid 'fr'
47 49 str = "Nom doit \xc3\xaatre renseign\xc3\xa9(e)"
48 50 str.force_encoding('UTF-8') if str.respond_to?(:force_encoding)
49 51 g = Group.new
50 52 assert !g.save
51 53 assert_include str, g.errors.full_messages
52 54 end
53 55
54 56 def test_roles_given_to_new_user
55 57 group = Group.find(11)
56 58 user = User.find(9)
57 59 project = Project.first
58 60
59 61 Member.create!(:principal => group, :project => project, :role_ids => [1, 2])
60 62 group.users << user
61 63 assert user.member_of?(project)
62 64 end
63 65
64 66 def test_roles_given_to_existing_user
65 67 group = Group.find(11)
66 68 user = User.find(9)
67 69 project = Project.first
68 70
69 71 group.users << user
70 72 m = Member.create!(:principal => group, :project => project, :role_ids => [1, 2])
71 73 assert user.member_of?(project)
72 74 end
73 75
74 76 def test_roles_updated
75 77 group = Group.find(11)
76 78 user = User.find(9)
77 79 project = Project.first
78 80 group.users << user
79 81 m = Member.create!(:principal => group, :project => project, :role_ids => [1])
80 82 assert_equal [1], user.reload.roles_for_project(project).collect(&:id).sort
81 83
82 84 m.role_ids = [1, 2]
83 85 assert_equal [1, 2], user.reload.roles_for_project(project).collect(&:id).sort
84 86
85 87 m.role_ids = [2]
86 88 assert_equal [2], user.reload.roles_for_project(project).collect(&:id).sort
87 89
88 90 m.role_ids = [1]
89 91 assert_equal [1], user.reload.roles_for_project(project).collect(&:id).sort
90 92 end
91 93
92 94 def test_roles_removed_when_removing_group_membership
93 95 assert User.find(8).member_of?(Project.find(5))
94 96 Member.find_by_project_id_and_user_id(5, 10).destroy
95 97 assert !User.find(8).member_of?(Project.find(5))
96 98 end
97 99
98 100 def test_roles_removed_when_removing_user_from_group
99 101 assert User.find(8).member_of?(Project.find(5))
100 102 User.find(8).groups.clear
101 103 assert !User.find(8).member_of?(Project.find(5))
102 104 end
103 105
104 106 def test_destroy_should_unassign_issues
105 107 group = Group.first
106 108 Issue.update_all(["assigned_to_id = ?", group.id], 'id = 1')
107 109
108 110 assert group.destroy
109 111 assert group.destroyed?
110 112
111 113 assert_equal nil, Issue.find(1).assigned_to_id
112 114 end
113 115 end
General Comments 0
You need to be logged in to leave comments. Login now