git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9643 e93f8b46-1217-0410-a6f0-8f06a7374b81tags/2.0.0
@@ -29,7 +29,7 @@ | |||
<% 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 %> | |||
@@ -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 |