remove trailing white-spaces from lib/tabular_form_builder.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7405 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
3587d3d105
commit
03c6fb1b9d
|
@ -1,16 +1,16 @@
|
|||
# redMine - project management software
|
||||
# Copyright (C) 2006-2007 Jean-Philippe Lang
|
||||
# Redmine - project management software
|
||||
# Copyright (C) 2006-2011 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.
|
||||
|
@ -19,33 +19,33 @@ require 'action_view/helpers/form_helper'
|
|||
|
||||
class TabularFormBuilder < ActionView::Helpers::FormBuilder
|
||||
include Redmine::I18n
|
||||
|
||||
|
||||
def initialize(object_name, object, template, options, proc)
|
||||
set_language_if_valid options.delete(:lang)
|
||||
super
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
(field_helpers - %w(radio_button hidden_field fields_for) + %w(date_select)).each do |selector|
|
||||
src = <<-END_SRC
|
||||
def #{selector}(field, options = {})
|
||||
def #{selector}(field, options = {})
|
||||
label_for_field(field, options) + super
|
||||
end
|
||||
END_SRC
|
||||
class_eval src, __FILE__, __LINE__
|
||||
end
|
||||
|
||||
def select(field, choices, options = {}, html_options = {})
|
||||
|
||||
def select(field, choices, options = {}, html_options = {})
|
||||
label_for_field(field, options) + super
|
||||
end
|
||||
|
||||
|
||||
# Returns a label tag for the given field
|
||||
def label_for_field(field, options = {})
|
||||
return ''.html_safe if options.delete(:no_label)
|
||||
text = options[:label].is_a?(Symbol) ? l(options[:label]) : options[:label]
|
||||
text ||= l(("field_" + field.to_s.gsub(/\_id$/, "")).to_sym)
|
||||
text += @template.content_tag("span", " *", :class => "required") if options.delete(:required)
|
||||
@template.content_tag("label", text.html_safe,
|
||||
:class => (@object && @object.errors[field] ? "error" : nil),
|
||||
@template.content_tag("label", text.html_safe,
|
||||
:class => (@object && @object.errors[field] ? "error" : nil),
|
||||
:for => (@object_name.to_s + "_" + field.to_s))
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue