diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-02-12 18:01:15 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-02-12 18:01:15 +0000 |
| commit | 09515222476d30adc0028ce384a098bb6daf77d7 (patch) | |
| tree | a6b3ac9d61a93955d6377e139a9a5418815b1028 | |
| parent | 42cc2d322ac21b7f792a802c6e6702980b198cde (diff) | |
| download | redmine-09515222476d30adc0028ce384a098bb6daf77d7.tar.gz redmine-09515222476d30adc0028ce384a098bb6daf77d7.zip | |
Merged r11331 and r11333 from trunk (#13075).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11363 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/views/context_menus/issues.html.erb | 2 | ||||
| -rw-r--r-- | test/functional/context_menus_controller_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/context_menus/issues.html.erb b/app/views/context_menus/issues.html.erb index c81e518ec..7968745b9 100644 --- a/app/views/context_menus/issues.html.erb +++ b/app/views/context_menus/issues.html.erb @@ -111,7 +111,7 @@ <li><%= bulk_update_custom_field_context_menu_link(field, text, value || text) %></li> <% end %> <% unless field.is_required? %> - <li><%= bulk_update_custom_field_context_menu_link(field, l(:label_none), '') %></li> + <li><%= bulk_update_custom_field_context_menu_link(field, l(:label_none), '__none__') %></li> <% end %> </ul> </li> diff --git a/test/functional/context_menus_controller_test.rb b/test/functional/context_menus_controller_test.rb index 55feeca43..1e668d5d5 100644 --- a/test/functional/context_menus_controller_test.rb +++ b/test/functional/context_menus_controller_test.rb @@ -132,7 +132,7 @@ class ContextMenusControllerTest < ActionController::TestCase :attributes => {:href => "/issues/bulk_update?ids%5B%5D=1&issue%5Bcustom_field_values%5D%5B#{field.id}%5D=Foo"} assert_tag 'a', :content => 'none', - :attributes => {:href => "/issues/bulk_update?ids%5B%5D=1&issue%5Bcustom_field_values%5D%5B#{field.id}%5D="} + :attributes => {:href => "/issues/bulk_update?ids%5B%5D=1&issue%5Bcustom_field_values%5D%5B#{field.id}%5D=__none__"} end def test_context_menu_should_not_include_null_value_for_required_custom_fields |