Project

General

Profile

Defect #13385 » rm13385-do_not_present_searchable_for_not_searchable_cf_formats-trunk_r12224.diff

Mischa The Evil, 2013-10-18 04:37

View differences:

test/functional/custom_fields_controller_test.rb (working copy)
assert_select '[name=?]', 'custom_field[default_value]', 0
end
def test_searchable_should_be_present_for_string_text_list_custom_field_formats_only
searchable_klasses = %w( IssueCustomField ProjectCustomField )
Redmine::CustomFieldFormat.available_formats.each do |format|
searchable_klasses.each do |sk|
get :new, :type => sk, :custom_field => {:field_format => format}
assert_response :success
case format
when 'string', 'text', 'list'
assert_select 'input[name=?][type=checkbox]', 'custom_field[searchable]', 1, format + " " + sk + " doesn't present searchable while it should"
when 'int', 'float', 'date', 'bool', 'user', 'version'
assert_select 'input[name=?][type=checkbox]', 'custom_field[searchable]', 0, format + " " + sk + " presents searchable while it shouldn't"
end
end
end
end
def test_new_js
get :new, :type => 'IssueCustomField', :custom_field => {:field_format => 'list'}, :format => 'js'
assert_response :success
app/views/custom_fields/_form.html.erb (working copy)
<p><%= f.check_box :is_required %></p>
<p><%= f.check_box :is_for_all %></p>
<p><%= f.check_box :is_filter %></p>
<p><%= f.check_box :searchable %></p>
<% unless @custom_field.format_in? 'int', 'float', 'date', 'bool', 'user', 'version' %>
<p><%= f.check_box :searchable %></p>
<% end %>
<p>
<label><%= l(:field_visible) %></label>
<label class="block">
......
<% when "ProjectCustomField" %>
<p><%= f.check_box :is_required %></p>
<p><%= f.check_box :visible %></p>
<p><%= f.check_box :searchable %></p>
<% unless @custom_field.format_in? 'int', 'float', 'date', 'bool', 'user', 'version' %>
<p><%= f.check_box :searchable %></p>
<% end %>
<p><%= f.check_box :is_filter %></p>
<% when "VersionCustomField" %>
(2-2/2)