From 09515222476d30adc0028ce384a098bb6daf77d7 2013-02-12 18:01:15
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: 2013-02-12 18:01:15
Subject: [PATCH] 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 c81e518..7968745 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 55feeca..1e668d5 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&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