kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use a textarea instead of an input for the default value of long text custom fields (#13176). 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11396 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2013-02-15 08:48:51 +00:00
parent 9a3e4e0a51
commit 32bf0f03ef
3 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/views/custom_fields/_form.html.erb
View File

@ -27,8 +27,14 @@
</p>
<% end %>
<% unless @custom_field.format_in? 'user', 'version' %>
<p><%= @custom_field.field_format == 'bool' ? f.check_box(:default_value) : f.text_field(:default_value) %></p>
<% case @custom_field.field_format %>
<% when 'bool' %>
<p><%= f.check_box(:default_value) %></p>
<% when 'text' %>
<p><%= f.text_area(:default_value, :rows => 8) %></p>
<% when 'user', 'version' %>
<% else %>
<p><%= f.text_field(:default_value) %></p>
<% end %>
<%= call_hook(:view_custom_fields_form_upper_box, :custom_field => @custom_field, :form => f) %>

2
public/stylesheets/application.css
View File

@ -454,6 +454,8 @@ table.fields_permissions td.readonly {background:#ddd;}
table.fields_permissions td.required {background:#d88;}
textarea#custom_field_possible_values {width: 99%}
textarea#custom_field_default_value {width: 99%}
input#content_comments {width: 99%}
p.pagination {margin-top:8px; font-size: 90%}

24
test/functional/custom_fields_controller_test.rb
View File

@ -56,6 +56,30 @@ class CustomFieldsControllerTest < ActionController::TestCase
end
end
def test_default_value_should_be_an_input_for_string_custom_field
get :new, :type => 'IssueCustomField', :custom_field => {:field_format => 'string'}
assert_response :success
assert_select 'input[name=?]', 'custom_field[default_value]'
end
def test_default_value_should_be_a_textarea_for_text_custom_field
get :new, :type => 'IssueCustomField', :custom_field => {:field_format => 'text'}
assert_response :success
assert_select 'textarea[name=?]', 'custom_field[default_value]'
end
def test_default_value_should_be_a_checkbox_for_bool_custom_field
get :new, :type => 'IssueCustomField', :custom_field => {:field_format => 'bool'}
assert_response :success
assert_select 'input[name=?][type=checkbox]', 'custom_field[default_value]'
end
def test_default_value_should_not_be_present_for_user_custom_field
get :new, :type => 'IssueCustomField', :custom_field => {:field_format => 'user'}
assert_response :success
assert_select '[name=?]', 'custom_field[default_value]', 0
end
def test_new_js
get :new, :type => 'IssueCustomField', :custom_field => {:field_format => 'list'}, :format => 'js'
assert_response :success