| @@ -0,0 +1,28 | |||||
|
|
1 | # Redmine - project management software | |||
|
|
2 | # Copyright (C) 2006-2014 Jean-Philippe Lang | |||
|
|
3 | # | |||
|
|
4 | # This program is free software; you can redistribute it and/or | |||
|
|
5 | # modify it under the terms of the GNU General Public License | |||
|
|
6 | # as published by the Free Software Foundation; either version 2 | |||
|
|
7 | # of the License, or (at your option) any later version. | |||
|
|
8 | # | |||
|
|
9 | # This program is distributed in the hope that it will be useful, | |||
|
|
10 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | |||
|
|
11 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
|
|
12 | # GNU General Public License for more details. | |||
|
|
13 | # | |||
|
|
14 | # You should have received a copy of the GNU General Public License | |||
|
|
15 | # along with this program; if not, write to the Free Software | |||
|
|
16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | |||
|
|
17 | ||||
|
|
18 | require File.expand_path('../../../../../test_helper', __FILE__) | |||
|
|
19 | ||||
|
|
20 | class Redmine::Views::LabelledFormBuilderTest < ActionView::TestCase | |||
|
|
21 | ||||
|
|
22 | def test_label_should_output_one_element | |||
|
|
23 | labelled_form_for(Issue.new) do |f| | |||
|
|
24 | output = f.label :subject | |||
|
|
25 | assert_equal output, '<label for="issue_subject">Subject</label>' | |||
|
|
26 | end | |||
|
|
27 | end | |||
|
|
28 | end | |||
| @@ -1,55 +1,55 | |||||
| 1 | # Redmine - project management software |
|
1 | # Redmine - project management software | |
| 2 | # Copyright (C) 2006-2014 Jean-Philippe Lang |
|
2 | # Copyright (C) 2006-2014 Jean-Philippe Lang | |
| 3 | # |
|
3 | # | |
| 4 | # This program is free software; you can redistribute it and/or |
|
4 | # This program is free software; you can redistribute it and/or | |
| 5 | # modify it under the terms of the GNU General Public License |
|
5 | # modify it under the terms of the GNU General Public License | |
| 6 | # as published by the Free Software Foundation; either version 2 |
|
6 | # as published by the Free Software Foundation; either version 2 | |
| 7 | # of the License, or (at your option) any later version. |
|
7 | # of the License, or (at your option) any later version. | |
| 8 | # |
|
8 | # | |
| 9 | # This program is distributed in the hope that it will be useful, |
|
9 | # This program is distributed in the hope that it will be useful, | |
| 10 | # but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
10 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 11 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
11 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 12 | # GNU General Public License for more details. |
|
12 | # GNU General Public License for more details. | |
| 13 | # |
|
13 | # | |
| 14 | # You should have received a copy of the GNU General Public License |
|
14 | # You should have received a copy of the GNU General Public License | |
| 15 | # along with this program; if not, write to the Free Software |
|
15 | # along with this program; if not, write to the Free Software | |
| 16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
|
16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | |
| 17 |
|
17 | |||
| 18 | require 'action_view/helpers/form_helper' |
|
18 | require 'action_view/helpers/form_helper' | |
| 19 |
|
19 | |||
| 20 | class Redmine::Views::LabelledFormBuilder < ActionView::Helpers::FormBuilder |
|
20 | class Redmine::Views::LabelledFormBuilder < ActionView::Helpers::FormBuilder | |
| 21 | include Redmine::I18n |
|
21 | include Redmine::I18n | |
| 22 |
|
22 | |||
| 23 | (field_helpers.map(&:to_s) - %w(radio_button hidden_field fields_for check_box) + |
|
23 | (field_helpers.map(&:to_s) - %w(radio_button hidden_field fields_for check_box label) + | |
| 24 | %w(date_select)).each do |selector| |
|
24 | %w(date_select)).each do |selector| | |
| 25 | src = <<-END_SRC |
|
25 | src = <<-END_SRC | |
| 26 | def #{selector}(field, options = {}) |
|
26 | def #{selector}(field, options = {}) | |
| 27 | label_for_field(field, options) + super(field, options.except(:label)).html_safe |
|
27 | label_for_field(field, options) + super(field, options.except(:label)).html_safe | |
| 28 | end |
|
28 | end | |
| 29 | END_SRC |
|
29 | END_SRC | |
| 30 | class_eval src, __FILE__, __LINE__ |
|
30 | class_eval src, __FILE__, __LINE__ | |
| 31 | end |
|
31 | end | |
| 32 |
|
32 | |||
| 33 | def check_box(field, options={}, checked_value="1", unchecked_value="0") |
|
33 | def check_box(field, options={}, checked_value="1", unchecked_value="0") | |
| 34 | label_for_field(field, options) + super(field, options.except(:label), checked_value, unchecked_value).html_safe |
|
34 | label_for_field(field, options) + super(field, options.except(:label), checked_value, unchecked_value).html_safe | |
| 35 | end |
|
35 | end | |
| 36 |
|
36 | |||
| 37 | def select(field, choices, options = {}, html_options = {}) |
|
37 | def select(field, choices, options = {}, html_options = {}) | |
| 38 | label_for_field(field, options) + super(field, choices, options, html_options.except(:label)).html_safe |
|
38 | label_for_field(field, options) + super(field, choices, options, html_options.except(:label)).html_safe | |
| 39 | end |
|
39 | end | |
| 40 |
|
40 | |||
| 41 | def time_zone_select(field, priority_zones = nil, options = {}, html_options = {}) |
|
41 | def time_zone_select(field, priority_zones = nil, options = {}, html_options = {}) | |
| 42 | label_for_field(field, options) + super(field, priority_zones, options, html_options.except(:label)).html_safe |
|
42 | label_for_field(field, options) + super(field, priority_zones, options, html_options.except(:label)).html_safe | |
| 43 | end |
|
43 | end | |
| 44 |
|
44 | |||
| 45 | # Returns a label tag for the given field |
|
45 | # Returns a label tag for the given field | |
| 46 | def label_for_field(field, options = {}) |
|
46 | def label_for_field(field, options = {}) | |
| 47 | return ''.html_safe if options.delete(:no_label) |
|
47 | return ''.html_safe if options.delete(:no_label) | |
| 48 | text = options[:label].is_a?(Symbol) ? l(options[:label]) : options[:label] |
|
48 | text = options[:label].is_a?(Symbol) ? l(options[:label]) : options[:label] | |
| 49 | text ||= l(("field_" + field.to_s.gsub(/\_id$/, "")).to_sym) |
|
49 | text ||= l(("field_" + field.to_s.gsub(/\_id$/, "")).to_sym) | |
| 50 | text += @template.content_tag("span", " *", :class => "required") if options.delete(:required) |
|
50 | text += @template.content_tag("span", " *", :class => "required") if options.delete(:required) | |
| 51 | @template.content_tag("label", text.html_safe, |
|
51 | @template.content_tag("label", text.html_safe, | |
| 52 | :class => (@object && @object.errors[field].present? ? "error" : nil), |
|
52 | :class => (@object && @object.errors[field].present? ? "error" : nil), | |
| 53 | :for => (@object_name.to_s + "_" + field.to_s)) |
|
53 | :for => (@object_name.to_s + "_" + field.to_s)) | |
| 54 | end |
|
54 | end | |
| 55 | end |
|
55 | end | |
General Comments 0
You need to be logged in to leave comments.
Login now