Let custom field formats control how they are edited.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3675 e93f8b46-1217-0410-a6f0-8f06a7374b81

Let custom field formats control how they are edited.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3675 e93f8b46-1217-0410-a6f0-8f06a7374b81
538642c5 · Eric Davis · 4cb94357 · 538642c5 · 538642c5
Commit 538642c5 authored Apr 16, 2010 by Eric Davis
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 3 deletions

custom_fields_helper.rb app/helpers/custom_fields_helper.rb +5 -3

custom_field_format.rb lib/redmine/custom_field_format.rb +7 -0

No files found.
--- a/app/helpers/custom_fields_helper.rb
+++ b/app/helpers/custom_fields_helper.rb
@@ -35,8 +35,9 @@ module CustomFieldsHelper
    custom_field = custom_value.custom_field
    field_name = "#{name}[custom_field_values][#{custom_field.id}]"
    field_id = "#{name}_custom_field_values_#{custom_field.id}"
-    
-    case custom_field.field_format
+
+    field_format = Redmine::CustomFieldFormat.find_by_name(custom_field.field_format)
+    case field_format.edit_as
    when "date"
      text_field_tag(field_name, custom_value.value, :id => field_id, :size => 10) + 
      calendar_for(field_id)
@@ -70,7 +71,8 @@ module CustomFieldsHelper
  def custom_field_tag_for_bulk_edit(name, custom_field)
    field_name = "#{name}[custom_field_values][#{custom_field.id}]"
    field_id = "#{name}_custom_field_values_#{custom_field.id}"
-    case custom_field.field_format
+    field_format = Redmine::CustomFieldFormat.find_by_name(custom_field.field_format)
+    case field_format.edit_as
      when "date"
        text_field_tag(field_name, '', :id => field_id, :size => 10) + 
        calendar_for(field_id)

--- a/lib/redmine/custom_field_format.rb
+++ b/lib/redmine/custom_field_format.rb
@@ -48,6 +48,13 @@ module Redmine
      }
    end

+    # Allow displaying the edit type of another field_format
+    #
+    # Example: display a custom field as a list
+    def edit_as
+      name
+    end
+
    class << self
      def map(&block)
        yield self