##// END OF EJS Templates
jro_apps » redmine
RSS
No blank option for custom fields marked as required on workflow settings....
Jean-Philippe Lang -
r9818:e23511076cd7
parent child
Show More
Side by Side Unified
Context file:
r9818:e23511076cd7 Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,27 +1,31
1 1 # encoding: utf-8
2 2 #
3 3 # Redmine - project management software
4 4 # Copyright (C) 2006-2012 Jean-Philippe Lang
5 5 #
6 6 # This program is free software; you can redistribute it and/or
7 7 # modify it under the terms of the GNU General Public License
8 8 # as published by the Free Software Foundation; either version 2
9 9 # of the License, or (at your option) any later version.
10 10 #
11 11 # This program is distributed in the hope that it will be useful,
12 12 # but WITHOUT ANY WARRANTY; without even the implied warranty of
13 13 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 14 # GNU General Public License for more details.
15 15 #
16 16 # You should have received a copy of the GNU General Public License
17 17 # along with this program; if not, write to the Free Software
18 18 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
19 19
20 20 module WorkflowsHelper
21 21 def field_permission_tag(permissions, status, field)
22 22 name = field.is_a?(CustomField) ? field.id.to_s : field
23 select_tag("permissions[#{name}][#{status.id}]",
24 options_for_select([["", ""], [l(:label_readonly), "readonly"], [l(:label_required), "required"]], permissions[status.id][name])
25 )
23 options = [["", ""], [l(:label_readonly), "readonly"], [l(:label_required), "required"]]
24
25 if field.is_a?(CustomField) && field.is_required?
26 options = [["(#{l(:label_required)})", ""], [l(:label_readonly), "readonly"]]
27 end
28
29 select_tag("permissions[#{name}][#{status.id}]", options_for_select(options, permissions[status.id][name]))
26 30 end
27 31 end
Show file before | Show file after | Hide comments
@@ -1,296 +1,312
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 require 'workflows_controller'
20 20
21 21 # Re-raise errors caught by the controller.
22 22 class WorkflowsController; def rescue_action(e) raise e end; end
23 23
24 24 class WorkflowsControllerTest < ActionController::TestCase
25 25 fixtures :roles, :trackers, :workflows, :users, :issue_statuses
26 26
27 27 def setup
28 28 @controller = WorkflowsController.new
29 29 @request = ActionController::TestRequest.new
30 30 @response = ActionController::TestResponse.new
31 31 User.current = nil
32 32 @request.session[:user_id] = 1 # admin
33 33 end
34 34
35 35 def test_index
36 36 get :index
37 37 assert_response :success
38 38 assert_template 'index'
39 39
40 40 count = WorkflowTransition.count(:all, :conditions => 'role_id = 1 AND tracker_id = 2')
41 41 assert_tag :tag => 'a', :content => count.to_s,
42 42 :attributes => { :href => '/workflows/edit?role_id=1&amp;tracker_id=2' }
43 43 end
44 44
45 45 def test_get_edit
46 46 get :edit
47 47 assert_response :success
48 48 assert_template 'edit'
49 49 assert_not_nil assigns(:roles)
50 50 assert_not_nil assigns(:trackers)
51 51 end
52 52
53 53 def test_get_edit_with_role_and_tracker
54 54 WorkflowTransition.delete_all
55 55 WorkflowTransition.create!(:role_id => 1, :tracker_id => 1, :old_status_id => 2, :new_status_id => 3)
56 56 WorkflowTransition.create!(:role_id => 2, :tracker_id => 1, :old_status_id => 3, :new_status_id => 5)
57 57
58 58 get :edit, :role_id => 2, :tracker_id => 1
59 59 assert_response :success
60 60 assert_template 'edit'
61 61
62 62 # used status only
63 63 assert_not_nil assigns(:statuses)
64 64 assert_equal [2, 3, 5], assigns(:statuses).collect(&:id)
65 65
66 66 # allowed transitions
67 67 assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
68 68 :name => 'issue_status[3][5][]',
69 69 :value => 'always',
70 70 :checked => 'checked' }
71 71 # not allowed
72 72 assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
73 73 :name => 'issue_status[3][2][]',
74 74 :value => 'always',
75 75 :checked => nil }
76 76 # unused
77 77 assert_no_tag :tag => 'input', :attributes => { :type => 'checkbox',
78 78 :name => 'issue_status[1][1][]' }
79 79 end
80 80
81 81 def test_get_edit_with_role_and_tracker_and_all_statuses
82 82 WorkflowTransition.delete_all
83 83
84 84 get :edit, :role_id => 2, :tracker_id => 1, :used_statuses_only => '0'
85 85 assert_response :success
86 86 assert_template 'edit'
87 87
88 88 assert_not_nil assigns(:statuses)
89 89 assert_equal IssueStatus.count, assigns(:statuses).size
90 90
91 91 assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
92 92 :name => 'issue_status[1][1][]',
93 93 :value => 'always',
94 94 :checked => nil }
95 95 end
96 96
97 97 def test_post_edit
98 98 post :edit, :role_id => 2, :tracker_id => 1,
99 99 :issue_status => {
100 100 '4' => {'5' => ['always']},
101 101 '3' => {'1' => ['always'], '2' => ['always']}
102 102 }
103 103 assert_redirected_to '/workflows/edit?role_id=2&tracker_id=1'
104 104
105 105 assert_equal 3, WorkflowTransition.count(:conditions => {:tracker_id => 1, :role_id => 2})
106 106 assert_not_nil WorkflowTransition.find(:first, :conditions => {:role_id => 2, :tracker_id => 1, :old_status_id => 3, :new_status_id => 2})
107 107 assert_nil WorkflowTransition.find(:first, :conditions => {:role_id => 2, :tracker_id => 1, :old_status_id => 5, :new_status_id => 4})
108 108 end
109 109
110 110 def test_post_edit_with_additional_transitions
111 111 post :edit, :role_id => 2, :tracker_id => 1,
112 112 :issue_status => {
113 113 '4' => {'5' => ['always']},
114 114 '3' => {'1' => ['author'], '2' => ['assignee'], '4' => ['author', 'assignee']}
115 115 }
116 116 assert_redirected_to '/workflows/edit?role_id=2&tracker_id=1'
117 117
118 118 assert_equal 4, WorkflowTransition.count(:conditions => {:tracker_id => 1, :role_id => 2})
119 119
120 120 w = WorkflowTransition.find(:first, :conditions => {:role_id => 2, :tracker_id => 1, :old_status_id => 4, :new_status_id => 5})
121 121 assert ! w.author
122 122 assert ! w.assignee
123 123 w = WorkflowTransition.find(:first, :conditions => {:role_id => 2, :tracker_id => 1, :old_status_id => 3, :new_status_id => 1})
124 124 assert w.author
125 125 assert ! w.assignee
126 126 w = WorkflowTransition.find(:first, :conditions => {:role_id => 2, :tracker_id => 1, :old_status_id => 3, :new_status_id => 2})
127 127 assert ! w.author
128 128 assert w.assignee
129 129 w = WorkflowTransition.find(:first, :conditions => {:role_id => 2, :tracker_id => 1, :old_status_id => 3, :new_status_id => 4})
130 130 assert w.author
131 131 assert w.assignee
132 132 end
133 133
134 134 def test_clear_workflow
135 135 assert WorkflowTransition.count(:conditions => {:tracker_id => 1, :role_id => 2}) > 0
136 136
137 137 post :edit, :role_id => 2, :tracker_id => 1
138 138 assert_equal 0, WorkflowTransition.count(:conditions => {:tracker_id => 1, :role_id => 2})
139 139 end
140 140
141 141 def test_get_permissions
142 142 get :permissions
143 143
144 144 assert_response :success
145 145 assert_template 'permissions'
146 146 assert_not_nil assigns(:roles)
147 147 assert_not_nil assigns(:trackers)
148 148 end
149 149
150 150 def test_get_permissions_with_role_and_tracker
151 151 WorkflowPermission.delete_all
152 152 WorkflowPermission.create!(:role_id => 1, :tracker_id => 2, :old_status_id => 2, :field_name => 'assigned_to_id', :rule => 'required')
153 153 WorkflowPermission.create!(:role_id => 1, :tracker_id => 2, :old_status_id => 2, :field_name => 'fixed_version_id', :rule => 'required')
154 154 WorkflowPermission.create!(:role_id => 1, :tracker_id => 2, :old_status_id => 3, :field_name => 'fixed_version_id', :rule => 'readonly')
155 155
156 156 get :permissions, :role_id => 1, :tracker_id => 2
157 157 assert_response :success
158 158 assert_template 'permissions'
159 159
160 160 assert_select 'input[name=role_id][value=1]'
161 161 assert_select 'input[name=tracker_id][value=2]'
162 162
163 163 # Required field
164 164 assert_select 'select[name=?]', 'permissions[assigned_to_id][2]' do
165 165 assert_select 'option[value=]'
166 166 assert_select 'option[value=][selected=selected]', 0
167 167 assert_select 'option[value=readonly]', :text => 'Read-only'
168 168 assert_select 'option[value=readonly][selected=selected]', 0
169 169 assert_select 'option[value=required]', :text => 'Required'
170 170 assert_select 'option[value=required][selected=selected]'
171 171 end
172 172
173 173 # Read-only field
174 174 assert_select 'select[name=?]', 'permissions[fixed_version_id][3]' do
175 175 assert_select 'option[value=]'
176 176 assert_select 'option[value=][selected=selected]', 0
177 177 assert_select 'option[value=readonly]', :text => 'Read-only'
178 178 assert_select 'option[value=readonly][selected=selected]'
179 179 assert_select 'option[value=required]', :text => 'Required'
180 180 assert_select 'option[value=required][selected=selected]', 0
181 181 end
182 182
183 183 # Other field
184 184 assert_select 'select[name=?]', 'permissions[due_date][3]' do
185 185 assert_select 'option[value=]'
186 186 assert_select 'option[value=][selected=selected]', 0
187 187 assert_select 'option[value=readonly]', :text => 'Read-only'
188 188 assert_select 'option[value=readonly][selected=selected]', 0
189 189 assert_select 'option[value=required]', :text => 'Required'
190 190 assert_select 'option[value=required][selected=selected]', 0
191 191 end
192 192 end
193 193
194 def test_get_permissions_with_always_required_custom_field
195 cf = IssueCustomField.create!(:name => 'Foo', :field_format => 'string', :tracker_ids => [1], :is_required => true)
196
197 get :permissions, :role_id => 1, :tracker_id => 1
198 assert_response :success
199 assert_template 'permissions'
200
201 # Custom field that is always required
202 # The default option is "(Required)"
203 assert_select 'select[name=?]', "permissions[#{cf.id}][3]" do
204 assert_select 'option[value=]', :text => '(Required)'
205 assert_select 'option[value=readonly]', :text => 'Read-only'
206 assert_select 'option[value=required]', 0
207 end
208 end
209
194 210 def test_get_permissions_with_role_and_tracker_and_all_statuses
195 211 WorkflowTransition.delete_all
196 212
197 213 get :permissions, :role_id => 1, :tracker_id => 2, :used_statuses_only => '0'
198 214 assert_response :success
199 215 assert_equal IssueStatus.sorted.all, assigns(:statuses)
200 216 end
201 217
202 218 def test_post_permissions
203 219 WorkflowPermission.delete_all
204 220
205 221 post :permissions, :role_id => 1, :tracker_id => 2, :permissions => {
206 222 'assigned_to_id' => {'1' => '', '2' => 'readonly', '3' => ''},
207 223 'fixed_version_id' => {'1' => 'required', '2' => 'readonly', '3' => ''},
208 224 'due_date' => {'1' => '', '2' => '', '3' => ''},
209 225 }
210 226 assert_redirected_to '/workflows/permissions?role_id=1&tracker_id=2'
211 227
212 228 workflows = WorkflowPermission.all
213 229 assert_equal 3, workflows.size
214 230 workflows.each do |workflow|
215 231 assert_equal 1, workflow.role_id
216 232 assert_equal 2, workflow.tracker_id
217 233 end
218 234 assert workflows.detect {|wf| wf.old_status_id == 2 && wf.field_name == 'assigned_to_id' && wf.rule == 'readonly'}
219 235 assert workflows.detect {|wf| wf.old_status_id == 1 && wf.field_name == 'fixed_version_id' && wf.rule == 'required'}
220 236 assert workflows.detect {|wf| wf.old_status_id == 2 && wf.field_name == 'fixed_version_id' && wf.rule == 'readonly'}
221 237 end
222 238
223 239 def test_post_permissions_should_clear_permissions
224 240 WorkflowPermission.delete_all
225 241 WorkflowPermission.create!(:role_id => 1, :tracker_id => 2, :old_status_id => 2, :field_name => 'assigned_to_id', :rule => 'required')
226 242 WorkflowPermission.create!(:role_id => 1, :tracker_id => 2, :old_status_id => 2, :field_name => 'fixed_version_id', :rule => 'required')
227 243 wf1 = WorkflowPermission.create!(:role_id => 1, :tracker_id => 3, :old_status_id => 2, :field_name => 'fixed_version_id', :rule => 'required')
228 244 wf2 = WorkflowPermission.create!(:role_id => 2, :tracker_id => 2, :old_status_id => 3, :field_name => 'fixed_version_id', :rule => 'readonly')
229 245
230 246 post :permissions, :role_id => 1, :tracker_id => 2
231 247 assert_redirected_to '/workflows/permissions?role_id=1&tracker_id=2'
232 248
233 249 workflows = WorkflowPermission.all
234 250 assert_equal 2, workflows.size
235 251 assert wf1.reload
236 252 assert wf2.reload
237 253 end
238 254
239 255 def test_get_copy
240 256 get :copy
241 257 assert_response :success
242 258 assert_template 'copy'
243 259 assert_select 'select[name=source_tracker_id]' do
244 260 assert_select 'option[value=1]', :text => 'Bug'
245 261 end
246 262 assert_select 'select[name=source_role_id]' do
247 263 assert_select 'option[value=2]', :text => 'Developer'
248 264 end
249 265 assert_select 'select[name=?]', 'target_tracker_ids[]' do
250 266 assert_select 'option[value=3]', :text => 'Support request'
251 267 end
252 268 assert_select 'select[name=?]', 'target_role_ids[]' do
253 269 assert_select 'option[value=1]', :text => 'Manager'
254 270 end
255 271 end
256 272
257 273 def test_post_copy_one_to_one
258 274 source_transitions = status_transitions(:tracker_id => 1, :role_id => 2)
259 275
260 276 post :copy, :source_tracker_id => '1', :source_role_id => '2',
261 277 :target_tracker_ids => ['3'], :target_role_ids => ['1']
262 278 assert_response 302
263 279 assert_equal source_transitions, status_transitions(:tracker_id => 3, :role_id => 1)
264 280 end
265 281
266 282 def test_post_copy_one_to_many
267 283 source_transitions = status_transitions(:tracker_id => 1, :role_id => 2)
268 284
269 285 post :copy, :source_tracker_id => '1', :source_role_id => '2',
270 286 :target_tracker_ids => ['2', '3'], :target_role_ids => ['1', '3']
271 287 assert_response 302
272 288 assert_equal source_transitions, status_transitions(:tracker_id => 2, :role_id => 1)
273 289 assert_equal source_transitions, status_transitions(:tracker_id => 3, :role_id => 1)
274 290 assert_equal source_transitions, status_transitions(:tracker_id => 2, :role_id => 3)
275 291 assert_equal source_transitions, status_transitions(:tracker_id => 3, :role_id => 3)
276 292 end
277 293
278 294 def test_post_copy_many_to_many
279 295 source_t2 = status_transitions(:tracker_id => 2, :role_id => 2)
280 296 source_t3 = status_transitions(:tracker_id => 3, :role_id => 2)
281 297
282 298 post :copy, :source_tracker_id => 'any', :source_role_id => '2',
283 299 :target_tracker_ids => ['2', '3'], :target_role_ids => ['1', '3']
284 300 assert_response 302
285 301 assert_equal source_t2, status_transitions(:tracker_id => 2, :role_id => 1)
286 302 assert_equal source_t3, status_transitions(:tracker_id => 3, :role_id => 1)
287 303 assert_equal source_t2, status_transitions(:tracker_id => 2, :role_id => 3)
288 304 assert_equal source_t3, status_transitions(:tracker_id => 3, :role_id => 3)
289 305 end
290 306
291 307 # Returns an array of status transitions that can be compared
292 308 def status_transitions(conditions)
293 309 WorkflowTransition.find(:all, :conditions => conditions,
294 310 :order => 'tracker_id, role_id, old_status_id, new_status_id').collect {|w| [w.old_status, w.new_status_id]}
295 311 end
296 312 end
General Comments 0
You need to be logged in to leave comments. Login now