From b91cbcaa0382362688c59eb192bce46508956f7b Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 5 Jul 2014 09:59:17 +0000 Subject: [PATCH] Option to render boolean custom fields as a single check box or radio buttons (#17003). git-svn-id: http://svn.redmine.org/redmine/trunk@13216 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/helpers/custom_fields_helper.rb | 8 ++- .../custom_fields/formats/_bool.html.erb | 2 +- lib/redmine/field_format.rb | 19 ++++++ .../redmine/field_format/bool_format_test.rb | 63 +++++++++++++++++++ 4 files changed, 89 insertions(+), 3 deletions(-) create mode 100644 test/unit/lib/redmine/field_format/bool_format_test.rb diff --git a/app/helpers/custom_fields_helper.rb b/app/helpers/custom_fields_helper.rb index 173e0d5f8..5153c1489 100644 --- a/app/helpers/custom_fields_helper.rb +++ b/app/helpers/custom_fields_helper.rb @@ -138,7 +138,11 @@ module CustomFieldsHelper end unless custom_values.empty? end - def edit_tag_style_tag(form) - form.select :edit_tag_style, [[l(:label_drop_down_list), ''], [l(:label_checkboxes), 'check_box']], :label => :label_display + def edit_tag_style_tag(form, options={}) + select_options = [[l(:label_drop_down_list), ''], [l(:label_checkboxes), 'check_box']] + if options[:include_radio] + select_options << [l(:label_radio_buttons), 'radio'] + end + form.select :edit_tag_style, select_options, :label => :label_display end end diff --git a/app/views/custom_fields/formats/_bool.html.erb b/app/views/custom_fields/formats/_bool.html.erb index 81aa64afe..3b791acfe 100644 --- a/app/views/custom_fields/formats/_bool.html.erb +++ b/app/views/custom_fields/formats/_bool.html.erb @@ -1,3 +1,3 @@

<%= f.select :default_value, [[]]+@custom_field.possible_values_options %>

<%= f.text_field :url_pattern, :size => 50, :label => :label_link_values_to %>

-

<%= edit_tag_style_tag f %>

+

<%= edit_tag_style_tag f, :include_radio => true %>

diff --git a/lib/redmine/field_format.rb b/lib/redmine/field_format.rb index f5e642628..b71a79f9b 100644 --- a/lib/redmine/field_format.rb +++ b/lib/redmine/field_format.rb @@ -566,6 +566,25 @@ module Redmine def group_statement(custom_field) order_statement(custom_field) end + + def edit_tag(view, tag_id, tag_name, custom_value, options={}) + case custom_value.custom_field.edit_tag_style + when 'check_box' + single_check_box_edit_tag(view, tag_id, tag_name, custom_value, options) + when 'radio' + check_box_edit_tag(view, tag_id, tag_name, custom_value, options) + else + select_edit_tag(view, tag_id, tag_name, custom_value, options) + end + end + + # Renders the edit tag as a simple check box + def single_check_box_edit_tag(view, tag_id, tag_name, custom_value, options={}) + s = ''.html_safe + s << view.hidden_field_tag(tag_name, '0', :id => nil) + s << view.check_box_tag(tag_name, '1', custom_value.value.to_s == '1', :id => tag_id) + view.content_tag('span', s, options) + end end class RecordList < List diff --git a/test/unit/lib/redmine/field_format/bool_format_test.rb b/test/unit/lib/redmine/field_format/bool_format_test.rb new file mode 100644 index 000000000..e5373a519 --- /dev/null +++ b/test/unit/lib/redmine/field_format/bool_format_test.rb @@ -0,0 +1,63 @@ +# Redmine - project management software +# Copyright (C) 2006-2014 Jean-Philippe Lang +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +require File.expand_path('../../../../../test_helper', __FILE__) +require 'redmine/field_format' + +class Redmine::BoolFieldFormatTest < ActionView::TestCase + include ApplicationHelper + include Redmine::I18n + + def setup + set_language_if_valid 'en' + end + + def test_check_box_style_should_render_edit_tag_as_check_box + field = IssueCustomField.new(:field_format => 'bool', :is_required => false, :edit_tag_style => 'check_box') + value = CustomFieldValue.new(:custom_field => field, :customized => Issue.new) + + tag = field.format.edit_tag(self, 'abc', 'xyz', value) + assert_select_in tag, 'input[name=xyz]', 2 + assert_select_in tag, 'input[id=abc]', 1 + assert_select_in tag, 'input[type=hidden][value=0]' + assert_select_in tag, 'input[type=checkbox][value=1]' + end + + def test_check_box_should_be_checked_when_value_is_set + field = IssueCustomField.new(:field_format => 'bool', :is_required => false, :edit_tag_style => 'check_box') + value = CustomFieldValue.new(:custom_field => field, :customized => Issue.new, :value => '1') + + tag = field.format.edit_tag(self, 'abc', 'xyz', value) + assert_select_in tag, 'input[type=checkbox][value=1][checked=checked]' + end + + def test_radio_style_should_render_edit_tag_as_radio_buttons + field = IssueCustomField.new(:field_format => 'bool', :is_required => false, :edit_tag_style => 'radio') + value = CustomFieldValue.new(:custom_field => field, :customized => Issue.new) + + tag = field.format.edit_tag(self, 'abc', 'xyz', value) + assert_select_in tag, 'input[type=radio][name=xyz]', 3 + end + + def test_default_style_should_render_edit_tag_as_select + field = IssueCustomField.new(:field_format => 'bool', :is_required => false) + value = CustomFieldValue.new(:custom_field => field, :customized => Issue.new) + + tag = field.format.edit_tag(self, 'abc', 'xyz', value) + assert_select_in tag, 'select[name=xyz]', 1 + end +end -- 2.39.5