##// END OF EJS Templates
Fixed that enumerations option tags are escaped....
Jean-Philippe Lang -
r9498:69e55fb1ef26
parent child
Show More
@@ -4,7 +4,7
4 <div class="box">
4 <div class="box">
5 <p><strong><%= l(:text_enumeration_destroy_question, @enumeration.objects_count) %></strong></p>
5 <p><strong><%= l(:text_enumeration_destroy_question, @enumeration.objects_count) %></strong></p>
6 <p><label for='reassign_to_id'><%= l(:text_enumeration_category_reassign_to) %></label>
6 <p><label for='reassign_to_id'><%= l(:text_enumeration_category_reassign_to) %></label>
7 <%= select_tag 'reassign_to_id', ("<option>--- #{l(:actionview_instancetag_blank_option)} ---</option>" + options_from_collection_for_select(@enumerations, 'id', 'name')) %></p>
7 <%= select_tag 'reassign_to_id', (content_tag('option', "--- #{l(:actionview_instancetag_blank_option)} ---") + options_from_collection_for_select(@enumerations, 'id', 'name')) %></p>
8 </div>
8 </div>
9
9
10 <%= submit_tag l(:button_apply) %>
10 <%= submit_tag l(:button_apply) %>
@@ -105,6 +105,9 class EnumerationsControllerTest < ActionController::TestCase
105 assert_response :success
105 assert_response :success
106 assert_template 'destroy'
106 assert_template 'destroy'
107 assert_not_nil Enumeration.find_by_id(4)
107 assert_not_nil Enumeration.find_by_id(4)
108 assert_select 'select[name=reassign_to_id]' do
109 assert_select 'option[value=6]', :text => 'High'
110 end
108 end
111 end
109
112
110 def test_destroy_enumeration_in_use_with_reassignment
113 def test_destroy_enumeration_in_use_with_reassignment
General Comments 0
You need to be logged in to leave comments. Login now