##// END OF EJS Templates
jro_apps » redmine
RSS
Merged r11331 and r11333 from trunk (#13075)....
Jean-Philippe Lang -
r11133:09515222476d
parent child
Show More
Side by Side Unified
Context file:
r11133:09515222476d Loading diff...:
Show file before | Show file after | Hide comments
@@ -111,7 +111,7
111 <li><%= bulk_update_custom_field_context_menu_link(field, text, value || text) %></li>
111 <li><%= bulk_update_custom_field_context_menu_link(field, text, value || text) %></li>
112 <% end %>
112 <% end %>
113 <% unless field.is_required? %>
113 <% unless field.is_required? %>
114 <li><%= bulk_update_custom_field_context_menu_link(field, l(:label_none), '') %></li>
114 <li><%= bulk_update_custom_field_context_menu_link(field, l(:label_none), '__none__') %></li>
115 <% end %>
115 <% end %>
116 </ul>
116 </ul>
117 </li>
117 </li>
Show file before | Show file after | Hide comments
@@ -132,7 +132,7 class ContextMenusControllerTest < ActionController::TestCase
132 :attributes => {:href => "/issues/bulk_update?ids%5B%5D=1&amp;issue%5Bcustom_field_values%5D%5B#{field.id}%5D=Foo"}
132 :attributes => {:href => "/issues/bulk_update?ids%5B%5D=1&amp;issue%5Bcustom_field_values%5D%5B#{field.id}%5D=Foo"}
133 assert_tag 'a',
133 assert_tag 'a',
134 :content => 'none',
134 :content => 'none',
135 :attributes => {:href => "/issues/bulk_update?ids%5B%5D=1&amp;issue%5Bcustom_field_values%5D%5B#{field.id}%5D="}
135 :attributes => {:href => "/issues/bulk_update?ids%5B%5D=1&amp;issue%5Bcustom_field_values%5D%5B#{field.id}%5D=__none__"}
136 end
136 end
137
137
138 def test_context_menu_should_not_include_null_value_for_required_custom_fields
138 def test_context_menu_should_not_include_null_value_for_required_custom_fields
General Comments 0
You need to be logged in to leave comments. Login now