* code and views cleaning

* javascript added on custom field form to show/hide fields according to the format of custom field

git-svn-id: http://redmine.rubyforge.org/svn/trunk@100 e93f8b46-1217-0410-a6f0-8f06a7374b81

2 files changed, 3 insertions, 2 deletions

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 196d91fca..0ca2568ae 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -161,6 +161,7 @@ class TabularFormBuilder < ActionView::Helpers::FormBuilder
   (field_helpers - %w(radio_button hidden_field) + %w(date_select)).each do |selector|

     src = <<-END_SRC

     def #{selector}(field, options = {}) 

+      return super if options.delete :no_label

       label_text = l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) + (options.delete(:required) ? @template.content_tag("span", " *", :class => "required"): "")

       label = @template.content_tag("label", label_text, 

                     :class => (@object.errors[field] ? "error" : nil), 

@@ -171,7 +172,7 @@ class TabularFormBuilder < ActionView::Helpers::FormBuilder
     class_eval src, __FILE__, __LINE__

   end

   

-  def select(field, choices, 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 = @template.content_tag("label", label_text, 

                   :class => (@object.errors[field] ? "error" : nil), 

diff --git a/app/helpers/custom_fields_helper.rb b/app/helpers/custom_fields_helper.rb
index 9df5c50a3..75b8a45cd 100644
--- a/app/helpers/custom_fields_helper.rb
+++ b/app/helpers/custom_fields_helper.rb
@@ -72,6 +72,6 @@ module CustomFieldsHelper
 

   # Return an array of custom field formats which can be used in select_tag

   def custom_field_formats_for_select

-    CustomField::FIELD_FORMATS.keys.collect { |k| [ l(CustomField::FIELD_FORMATS[k]), k ] }

+    CustomField::FIELD_FORMATS.sort {|a,b| a[1][:order]<=>b[1][:order]}.collect { |k| [ l(k[1][:name]), k[0] ] }

   end
 end