From ee8dcab9db0ad3bb3818051b7a1fd5211b9cdf0d Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 5 May 2012 16:09:27 +0000 Subject: [PATCH] Fixed that activities option tags on the time entry bulk edit form are escaped. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9643 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/timelog/bulk_edit.html.erb | 2 +- test/functional/timelog_controller_test.rb | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/views/timelog/bulk_edit.html.erb b/app/views/timelog/bulk_edit.html.erb index dc0bd92f3..f1d4ed979 100644 --- a/app/views/timelog/bulk_edit.html.erb +++ b/app/views/timelog/bulk_edit.html.erb @@ -29,7 +29,7 @@ <% if @available_activities.any? %>

- <%= select_tag('time_entry[activity_id]', "" + 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)) %>

<% end %> diff --git a/test/functional/timelog_controller_test.rb b/test/functional/timelog_controller_test.rb index f91f33c7c..410bbd3e5 100644 --- a/test/functional/timelog_controller_test.rb +++ b/test/functional/timelog_controller_test.rb @@ -278,6 +278,12 @@ class TimelogControllerTest < ActionController::TestCase # 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 -- 2.39.5