##// END OF EJS Templates
jro_apps » redmine
RSS
Fixed that activities option tags on the time entry bulk edit form are escaped....
Jean-Philippe Lang -
r9460:ee8dcab9db0a
parent child
Show More
Side by Side Unified
Context file:
r9460:ee8dcab9db0a Loading diff...:
Show file before | Show file after | Hide comments
@@ -29,7 +29,7
29 <% if @available_activities.any? %>
29 <% if @available_activities.any? %>
30 <p>
30 <p>
31 <label><%= l(:field_activity) %></label>
31 <label><%= l(:field_activity) %></label>
32 <%= select_tag('time_entry[activity_id]', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(@available_activities, :id, :name)) %>
32 <%= select_tag('time_entry[activity_id]', content_tag('option', l(:label_no_change_option), :value => '') + options_from_collection_for_select(@available_activities, :id, :name)) %>
33 </p>
33 </p>
34 <% end %>
34 <% end %>
35
35
Show file before | Show file after | Hide comments
@@ -278,6 +278,12 class TimelogControllerTest < ActionController::TestCase
278
278
279 # System wide custom field
279 # System wide custom field
280 assert_tag :select, :attributes => {:name => 'time_entry[custom_field_values][10]'}
280 assert_tag :select, :attributes => {:name => 'time_entry[custom_field_values][10]'}
281
282 # Activities
283 assert_select 'select[name=?]', 'time_entry[activity_id]' do
284 assert_select 'option[value=]', :text => '(No change)'
285 assert_select 'option[value=9]', :text => 'Design'
286 end
281 end
287 end
282
288
283 def test_get_bulk_edit_on_different_projects
289 def test_get_bulk_edit_on_different_projects
General Comments 0
You need to be logged in to leave comments. Login now