jro_apps/redmine Commit - r9460:ee8dcab9db0a

Fixed that activities option tags on the time entry bulk edit form are escaped....

Jean-Philippe Lang -

r9460:ee8dcab9db0a

parent child

Context file:

r9460:ee8dcab9db0a

app/views/timelog/bulk_edit.html.erb +1 -1

                  <% if @available_activities.any? %>
                  <p>
                    <label><%= l(:field_activity) %></label>
-                   <%= select_tag('time_entry[activity_id]', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(@available_activities, :id, :name)) %>
+                   <%= select_tag('time_entry[activity_id]', content_tag('option', l(:label_no_change_option), :value => '') + options_from_collection_for_select(@available_activities, :id, :name)) %>
                  </p>
                  <% end %>

test/functional/timelog_controller_test.rb +6 0

                  # System wide custom field
                  assert_tag :select, :attributes => {:name => 'time_entry[custom_field_values][10]'}
+                 # Activities
+                 assert_select 'select[name=?]', 'time_entry[activity_id]' do
+                   assert_select 'option[value=]', :text => '(No change)'
+                   assert_select 'option[value=9]', :text => 'Design'
+                 end
                end
                def test_get_bulk_edit_on_different_projects

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages