##// END OF EJS Templates
remove trailing white-spaces from lib/tabular_form_builder.rb...
Toshi MARUYAMA -
r7285:03c6fb1b9d8b
parent child
Show More
@@ -1,16 +1,16
1 # redMine - project management software
2 # Copyright (C) 2006-2007 Jean-Philippe Lang
1 # Redmine - project management software
2 # Copyright (C) 2006-2011 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 #
8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 #
13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -19,33 +19,33 require 'action_view/helpers/form_helper'
19 19
20 20 class TabularFormBuilder < ActionView::Helpers::FormBuilder
21 21 include Redmine::I18n
22
22
23 23 def initialize(object_name, object, template, options, proc)
24 24 set_language_if_valid options.delete(:lang)
25 25 super
26 end
27
26 end
27
28 28 (field_helpers - %w(radio_button hidden_field fields_for) + %w(date_select)).each do |selector|
29 29 src = <<-END_SRC
30 def #{selector}(field, options = {})
30 def #{selector}(field, options = {})
31 31 label_for_field(field, options) + super
32 32 end
33 33 END_SRC
34 34 class_eval src, __FILE__, __LINE__
35 35 end
36
37 def select(field, choices, options = {}, html_options = {})
36
37 def select(field, choices, options = {}, html_options = {})
38 38 label_for_field(field, options) + super
39 39 end
40
40
41 41 # Returns a label tag for the given field
42 42 def label_for_field(field, options = {})
43 43 return ''.html_safe if options.delete(:no_label)
44 44 text = options[:label].is_a?(Symbol) ? l(options[:label]) : options[:label]
45 45 text ||= l(("field_" + field.to_s.gsub(/\_id$/, "")).to_sym)
46 46 text += @template.content_tag("span", " *", :class => "required") if options.delete(:required)
47 @template.content_tag("label", text.html_safe,
48 :class => (@object && @object.errors[field] ? "error" : nil),
47 @template.content_tag("label", text.html_safe,
48 :class => (@object && @object.errors[field] ? "error" : nil),
49 49 :for => (@object_name.to_s + "_" + field.to_s))
50 50 end
51 51 end
General Comments 0
You need to be logged in to leave comments. Login now