Refactor TabularFormBuilder field helpers (#2461).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2247 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
bc270b31c3
commit
09620eef76
|
@ -28,24 +28,24 @@ class TabularFormBuilder < ActionView::Helpers::FormBuilder
|
||||||
(field_helpers - %w(radio_button hidden_field) + %w(date_select)).each do |selector|
|
(field_helpers - %w(radio_button hidden_field) + %w(date_select)).each do |selector|
|
||||||
src = <<-END_SRC
|
src = <<-END_SRC
|
||||||
def #{selector}(field, options = {})
|
def #{selector}(field, options = {})
|
||||||
return super if options.delete :no_label
|
label_for_field(field, options) + super
|
||||||
label_text = l(options[:label]) if options[:label]
|
|
||||||
label_text ||= l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym)
|
|
||||||
label_text << @template.content_tag("span", " *", :class => "required") if options.delete(:required)
|
|
||||||
label = @template.content_tag("label", label_text,
|
|
||||||
:class => (@object && @object.errors[field] ? "error" : nil),
|
|
||||||
:for => (@object_name.to_s + "_" + field.to_s))
|
|
||||||
label + super
|
|
||||||
end
|
end
|
||||||
END_SRC
|
END_SRC
|
||||||
class_eval src, __FILE__, __LINE__
|
class_eval src, __FILE__, __LINE__
|
||||||
end
|
end
|
||||||
|
|
||||||
def select(field, choices, options = {}, html_options = {})
|
def select(field, choices, options = {}, html_options = {})
|
||||||
label_text = l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) + (options.delete(:required) ? @template.content_tag("span", " *", :class => "required"): "")
|
label_for_field(field, options) + super
|
||||||
label = @template.content_tag("label", label_text,
|
end
|
||||||
|
|
||||||
|
# Returns a label tag for the given field
|
||||||
|
def label_for_field(field, options = {})
|
||||||
|
return '' if options.delete(:no_label)
|
||||||
|
text = l(options[:label]) if 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,
|
||||||
:class => (@object && @object.errors[field] ? "error" : nil),
|
:class => (@object && @object.errors[field] ? "error" : nil),
|
||||||
:for => (@object_name.to_s + "_" + field.to_s))
|
:for => (@object_name.to_s + "_" + field.to_s))
|
||||||
label + super
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue