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

diff --git a/app/views/context_menus/issues.html.erb b/app/views/context_menus/issues.html.erb
index c81e518ec6d4e7e1ac8e963deca9f0df08737957..7968745b977d276a37e36d08e30b1934cbc4f93b 100644 (file)
--- 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 55feeca4349fcdd4c7b260270a7f4fe0a3255d8f..1e668d5d52e59a058ec39ec5a5dbae18f4019b4e 100644 (file)
--- 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&amp;issue%5Bcustom_field_values%5D%5B#{field.id}%5D=Foo"}
     assert_tag 'a',
       :content => 'none',
-      :attributes => {:href => "/issues/bulk_update?ids%5B%5D=1&amp;issue%5Bcustom_field_values%5D%5B#{field.id}%5D="}
+      :attributes => {:href => "/issues/bulk_update?ids%5B%5D=1&amp;issue%5Bcustom_field_values%5D%5B#{field.id}%5D=__none__"}
   end
 
   def test_context_menu_should_not_include_null_value_for_required_custom_fields