Merged r13216, r13217 (#17003).

git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13222 e93f8b46-1217-0410-a6f0-8f06a7374b81

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

app/views/custom_fields/formats/_bool.html.erb

@@ -1,3 +1,3 @@
 <p><%= f.select :default_value, [[]]+@custom_field.possible_values_options %></p>
 <p><%= f.text_field :url_pattern, :size => 50, :label => :label_link_values_to %></p>
-<p><%= edit_tag_style_tag f %></p>
+<p><%= edit_tag_style_tag f, :include_radio => true %></p>

config/locales/ar.yml

@@ -1115,3 +1115,4 @@ ar:
   label_check_for_updates: Check for updates
   label_latest_compatible_version: Latest compatible version
   label_unknown_plugin: Unknown plugin
+  label_radio_buttons: radio buttons

config/locales/az.yml

@@ -1212,3 +1212,4 @@ az:
   label_check_for_updates: Check for updates
   label_latest_compatible_version: Latest compatible version
   label_unknown_plugin: Unknown plugin
+  label_radio_buttons: radio buttons

config/locales/bg.yml

@@ -1109,3 +1109,4 @@ bg:
   description_date_from: Въведете начална дата
   description_date_to: Въведете крайна дата
   text_repository_identifier_info: 'Позволени са малки букви (a-z), цифри, тирета и _.<br />Промяна след създаването му не е възможна.'
+  label_radio_buttons: radio buttons

config/locales/bs.yml

@@ -1128,3 +1128,4 @@ bs:
   label_check_for_updates: Check for updates
   label_latest_compatible_version: Latest compatible version
   label_unknown_plugin: Unknown plugin
+  label_radio_buttons: radio buttons

config/locales/ca.yml

@@ -1117,3 +1117,4 @@ ca:
   label_check_for_updates: Check for updates
   label_latest_compatible_version: Latest compatible version
   label_unknown_plugin: Unknown plugin
+  label_radio_buttons: radio buttons

config/locales/cs.yml

@@ -1117,3 +1117,4 @@ cs:
   label_check_for_updates: Zkontroluj aktualizace
   label_latest_compatible_version: Poslední kompatibilní verze
   label_unknown_plugin: Nezámý plugin
+  label_radio_buttons: radio buttons

config/locales/da.yml

@@ -1132,3 +1132,4 @@ da:
   label_check_for_updates: Check for updates
   label_latest_compatible_version: Latest compatible version
   label_unknown_plugin: Unknown plugin
+  label_radio_buttons: radio buttons

config/locales/de.yml

@@ -1124,3 +1124,4 @@ de:
   version_status_open: offen
 
   warning_attachments_not_saved: "%{count} Datei(en) konnten nicht gespeichert werden."
+  label_radio_buttons: radio buttons

config/locales/el.yml

@@ -1115,3 +1115,4 @@ el:
   label_check_for_updates: Check for updates
   label_latest_compatible_version: Latest compatible version
   label_unknown_plugin: Unknown plugin
+  label_radio_buttons: radio buttons

config/locales/en-GB.yml

@@ -1117,3 +1117,4 @@ en-GB:
   label_check_for_updates: Check for updates
   label_latest_compatible_version: Latest compatible version
   label_unknown_plugin: Unknown plugin
+  label_radio_buttons: radio buttons

config/locales/en.yml

@@ -909,6 +909,7 @@ en:
   label_only: only
   label_drop_down_list: drop-down list
   label_checkboxes: checkboxes
+  label_radio_buttons: radio buttons
   label_link_values_to: Link values to URL
   label_custom_field_select_type: Select the type of object to which the custom field is to be attached
   label_check_for_updates: Check for updates

config/locales/es.yml

@@ -1148,3 +1148,4 @@ es:
   label_check_for_updates: Check for updates
   label_latest_compatible_version: Latest compatible version
   label_unknown_plugin: Unknown plugin
+  label_radio_buttons: radio buttons

config/locales/et.yml

@@ -1128,3 +1128,4 @@ et:
   label_check_for_updates: Check for updates
   label_latest_compatible_version: Latest compatible version
   label_unknown_plugin: Unknown plugin
+  label_radio_buttons: radio buttons

config/locales/eu.yml

@@ -1116,3 +1116,4 @@ eu:
   label_check_for_updates: Check for updates
   label_latest_compatible_version: Latest compatible version
   label_unknown_plugin: Unknown plugin
+  label_radio_buttons: radio buttons

config/locales/fa.yml

@@ -1117,3 +1117,4 @@ fa:
   label_check_for_updates: Check for updates
   label_latest_compatible_version: Latest compatible version
   label_unknown_plugin: Unknown plugin
+  label_radio_buttons: radio buttons

config/locales/fi.yml

@@ -1136,3 +1136,4 @@ fi:
   label_check_for_updates: Check for updates
   label_latest_compatible_version: Latest compatible version
   label_unknown_plugin: Unknown plugin
+  label_radio_buttons: radio buttons

config/locales/fr.yml

@@ -885,6 +885,7 @@ fr:
   label_only: seulement
   label_drop_down_list: liste déroulante
   label_checkboxes: cases à cocher
+  label_radio_buttons: boutons radio
   label_link_values_to: Lier les valeurs vers l'URL
   label_custom_field_select_type: Selectionner le type d'objet auquel attacher le champ personnalisé
   label_check_for_updates: Vérifier les mises à jour

config/locales/gl.yml

@@ -1126,3 +1126,4 @@ gl:
   label_check_for_updates: Check for updates
   label_latest_compatible_version: Latest compatible version
   label_unknown_plugin: Unknown plugin
+  label_radio_buttons: radio buttons

config/locales/he.yml

@@ -1120,3 +1120,4 @@ he:
   label_check_for_updates: Check for updates
   label_latest_compatible_version: Latest compatible version
   label_unknown_plugin: Unknown plugin
+  label_radio_buttons: radio buttons

config/locales/hr.yml

@@ -1116,3 +1116,4 @@ hr:
   label_check_for_updates: Check for updates
   label_latest_compatible_version: Latest compatible version
   label_unknown_plugin: Unknown plugin
+  label_radio_buttons: radio buttons

config/locales/hu.yml

@@ -1134,3 +1134,4 @@
   label_check_for_updates: Check for updates
   label_latest_compatible_version: Latest compatible version
   label_unknown_plugin: Unknown plugin
+  label_radio_buttons: radio buttons

config/locales/id.yml

@@ -1119,3 +1119,4 @@ id:
   label_check_for_updates: Check for updates
   label_latest_compatible_version: Latest compatible version
   label_unknown_plugin: Unknown plugin
+  label_radio_buttons: radio buttons

config/locales/it.yml

@@ -1114,3 +1114,4 @@ it:
   label_check_for_updates: Check for updates
   label_latest_compatible_version: Latest compatible version
   label_unknown_plugin: Unknown plugin
+  label_radio_buttons: radio buttons

config/locales/ja.yml

@@ -1139,3 +1139,4 @@ ja:
   label_check_for_updates: アップデートを確認
   label_latest_compatible_version: 互換性のある最新バージョン
   label_unknown_plugin: 不明なプラグイン
+  label_radio_buttons: radio buttons

config/locales/ko.yml

@@ -1159,3 +1159,4 @@ ko:
   label_check_for_updates: Check for updates
   label_latest_compatible_version: Latest compatible version
   label_unknown_plugin: Unknown plugin
+  label_radio_buttons: radio buttons

config/locales/lt.yml

@@ -1174,3 +1174,4 @@ lt:
   label_check_for_updates: Check for updates
   label_latest_compatible_version: Latest compatible version
   label_unknown_plugin: Unknown plugin
+  label_radio_buttons: radio buttons

config/locales/lv.yml

@@ -1109,3 +1109,4 @@ lv:
   label_check_for_updates: Check for updates
   label_latest_compatible_version: Latest compatible version
   label_unknown_plugin: Unknown plugin
+  label_radio_buttons: radio buttons

config/locales/mk.yml

@@ -1115,3 +1115,4 @@ mk:
   label_check_for_updates: Check for updates
   label_latest_compatible_version: Latest compatible version
   label_unknown_plugin: Unknown plugin
+  label_radio_buttons: radio buttons

config/locales/mn.yml

@@ -1116,3 +1116,4 @@ mn:
   label_check_for_updates: Check for updates
   label_latest_compatible_version: Latest compatible version
   label_unknown_plugin: Unknown plugin
+  label_radio_buttons: radio buttons

config/locales/nl.yml

@@ -1094,3 +1094,4 @@ nl:
   label_check_for_updates: Check for updates
   label_latest_compatible_version: Latest compatible version
   label_unknown_plugin: Unknown plugin
+  label_radio_buttons: radio buttons

config/locales/no.yml

@@ -1105,3 +1105,4 @@
   label_check_for_updates: Check for updates
   label_latest_compatible_version: Latest compatible version
   label_unknown_plugin: Unknown plugin
+  label_radio_buttons: radio buttons

config/locales/pl.yml

@@ -1135,3 +1135,4 @@ pl:
   label_check_for_updates: Check for updates
   label_latest_compatible_version: Latest compatible version
   label_unknown_plugin: Unknown plugin
+  label_radio_buttons: radio buttons

config/locales/pt-BR.yml

@@ -1134,3 +1134,4 @@ pt-BR:
   label_check_for_updates: Check for updates
   label_latest_compatible_version: Latest compatible version
   label_unknown_plugin: Unknown plugin
+  label_radio_buttons: radio buttons

config/locales/pt.yml

@@ -1121,3 +1121,4 @@ pt:
   label_check_for_updates: Check for updates
   label_latest_compatible_version: Latest compatible version
   label_unknown_plugin: Unknown plugin
+  label_radio_buttons: radio buttons

config/locales/ro.yml

@@ -1110,3 +1110,4 @@ ro:
   label_check_for_updates: Check for updates
   label_latest_compatible_version: Latest compatible version
   label_unknown_plugin: Unknown plugin
+  label_radio_buttons: radio buttons

config/locales/ru.yml

@@ -1221,3 +1221,4 @@ ru:
   label_check_for_updates: Check for updates
   label_latest_compatible_version: Latest compatible version
   label_unknown_plugin: Unknown plugin
+  label_radio_buttons: radio buttons

config/locales/sk.yml

@@ -1105,3 +1105,4 @@ sk:
   label_check_for_updates: Check for updates
   label_latest_compatible_version: Latest compatible version
   label_unknown_plugin: Unknown plugin
+  label_radio_buttons: radio buttons

config/locales/sl.yml

@@ -1115,3 +1115,4 @@ sl:
   label_check_for_updates: Check for updates
   label_latest_compatible_version: Latest compatible version
   label_unknown_plugin: Unknown plugin
+  label_radio_buttons: radio buttons

config/locales/sq.yml

@@ -1111,3 +1111,4 @@ sq:
   label_check_for_updates: Check for updates
   label_latest_compatible_version: Latest compatible version
   label_unknown_plugin: Unknown plugin
+  label_radio_buttons: radio buttons

config/locales/sr-YU.yml

@@ -1117,3 +1117,4 @@ sr-YU:
   label_check_for_updates: Check for updates
   label_latest_compatible_version: Latest compatible version
   label_unknown_plugin: Unknown plugin
+  label_radio_buttons: radio buttons

config/locales/sr.yml

@@ -1116,3 +1116,4 @@ sr:
   label_check_for_updates: Check for updates
   label_latest_compatible_version: Latest compatible version
   label_unknown_plugin: Unknown plugin
+  label_radio_buttons: radio buttons

config/locales/sv.yml

@@ -1153,3 +1153,4 @@ sv:
   label_check_for_updates: Check for updates
   label_latest_compatible_version: Latest compatible version
   label_unknown_plugin: Unknown plugin
+  label_radio_buttons: radio buttons

config/locales/th.yml

@@ -1112,3 +1112,4 @@ th:
   label_check_for_updates: Check for updates
   label_latest_compatible_version: Latest compatible version
   label_unknown_plugin: Unknown plugin
+  label_radio_buttons: radio buttons

config/locales/tr.yml

@@ -1124,3 +1124,4 @@ tr:
   label_check_for_updates: Check for updates
   label_latest_compatible_version: Latest compatible version
   label_unknown_plugin: Unknown plugin
+  label_radio_buttons: radio buttons

config/locales/uk.yml

@@ -1110,3 +1110,4 @@ uk:
   label_check_for_updates: Check for updates
   label_latest_compatible_version: Latest compatible version
   label_unknown_plugin: Unknown plugin
+  label_radio_buttons: radio buttons

config/locales/vi.yml

@@ -1168,3 +1168,4 @@ vi:
   label_check_for_updates: Check for updates
   label_latest_compatible_version: Latest compatible version
   label_unknown_plugin: Unknown plugin
+  label_radio_buttons: radio buttons

config/locales/zh-TW.yml

@@ -1192,3 +1192,4 @@
   description_date_from: 輸入起始日期
   description_date_to: 輸入結束日期
   text_repository_identifier_info: '僅允許使用小寫英文字母 (a-z), 阿拉伯數字, 虛線與底線。<br />一旦儲存之後, 代碼便無法再次被更改。'
+  label_radio_buttons: radio buttons

config/locales/zh.yml

@@ -1116,3 +1116,4 @@ zh:
   label_check_for_updates: Check for updates
   label_latest_compatible_version: Latest compatible version
   label_unknown_plugin: Unknown plugin
+  label_radio_buttons: radio buttons

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

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