comparison lib/tabular_form_builder.rb @ 909:cbb26bc654de redmine-1.3

Update to Redmine 1.3-stable branch (Redmine SVN rev 8964)

-# 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.
 
 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      
-      
-  (field_helpers - %w(radio_button hidden_field fields_for) + %w(date_select)).each do |selector|
+
+  (field_helpers.map(&:to_s) - %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 '' if options.delete(:no_label)
+      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, 
-                                     :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