diff app/helpers/custom_fields_helper.rb @ 1517:dffacf8a6908 redmine-2.5

Update to Redmine SVN revision 13367 on 2.5-stable branch

--- a/app/helpers/custom_fields_helper.rb	Tue Sep 09 09:28:31 2014 +0100
+++ b/app/helpers/custom_fields_helper.rb	Tue Sep 09 09:29:00 2014 +0100
@@ -40,55 +40,48 @@
      :label => DocumentCategory::OptionName}
   ]
 
-  def custom_fields_tabs
-    CUSTOM_FIELDS_TABS
+  def render_custom_fields_tabs(types)
+    tabs = CUSTOM_FIELDS_TABS.select {|h| types.include?(h[:name]) }
+    render_tabs tabs
+  end
+
+  def custom_field_type_options
+    CUSTOM_FIELDS_TABS.map {|h| [l(h[:label]), h[:name]]}
+  end
+
+  def render_custom_field_format_partial(form, custom_field)
+    partial = custom_field.format.form_partial
+    if partial
+      render :partial => custom_field.format.form_partial, :locals => {:f => form, :custom_field => custom_field}
+    end
+  end
+
+  def custom_field_tag_name(prefix, custom_field)
+    name = "#{prefix}[custom_field_values][#{custom_field.id}]"
+    name << "[]" if custom_field.multiple?
+    name
+  end
+
+  def custom_field_tag_id(prefix, custom_field)
+    "#{prefix}_custom_field_values_#{custom_field.id}"
   end
 
   # Return custom field html tag corresponding to its format
-  def custom_field_tag(name, custom_value)
-    custom_field = custom_value.custom_field
-    field_name = "#{name}[custom_field_values][#{custom_field.id}]"
-    field_name << "[]" if custom_field.multiple?
-    field_id = "#{name}_custom_field_values_#{custom_field.id}"
-
-    tag_options = {:id => field_id, :class => "#{custom_field.field_format}_cf"}
-
-    field_format = Redmine::CustomFieldFormat.find_by_name(custom_field.field_format)
-    case field_format.try(:edit_as)
-    when "date"
-      text_field_tag(field_name, custom_value.value, tag_options.merge(:size => 10)) +
-      calendar_for(field_id)
-    when "text"
-      text_area_tag(field_name, custom_value.value, tag_options.merge(:rows => 3))
-    when "bool"
-      hidden_field_tag(field_name, '0') + check_box_tag(field_name, '1', custom_value.true?, tag_options)
-    when "list"
-      blank_option = ''.html_safe
-      unless custom_field.multiple?
-        if custom_field.is_required?
-          unless custom_field.default_value.present?
-            blank_option = content_tag('option', "--- #{l(:actionview_instancetag_blank_option)} ---", :value => '')
-          end
-        else
-          blank_option = content_tag('option')
-        end
-      end
-      s = select_tag(field_name, blank_option + options_for_select(custom_field.possible_values_options(custom_value.customized), custom_value.value),
-        tag_options.merge(:multiple => custom_field.multiple?))
-      if custom_field.multiple?
-        s << hidden_field_tag(field_name, '')
-      end
-      s
-    else
-      text_field_tag(field_name, custom_value.value, tag_options)
-    end
+  def custom_field_tag(prefix, custom_value)
+    custom_value.custom_field.format.edit_tag self,
+      custom_field_tag_id(prefix, custom_value.custom_field),
+      custom_field_tag_name(prefix, custom_value.custom_field),
+      custom_value,
+      :class => "#{custom_value.custom_field.field_format}_cf"
   end
 
   # Return custom field label tag
   def custom_field_label_tag(name, custom_value, options={})
     required = options[:required] || custom_value.custom_field.is_required?
+    title = custom_value.custom_field.description.presence
+    content = content_tag 'span', custom_value.custom_field.name, :title => title
 
-    content_tag "label", h(custom_value.custom_field.name) +
+    content_tag "label", content +
       (required ? " <span class=\"required\">*</span>".html_safe : ""),
       :for => "#{name}_custom_field_values_#{custom_value.custom_field.id}"
   end
@@ -98,65 +91,30 @@
     custom_field_label_tag(name, custom_value, options) + custom_field_tag(name, custom_value)
   end
 
-  def custom_field_tag_for_bulk_edit(name, custom_field, projects=nil, value='')
-    field_name = "#{name}[custom_field_values][#{custom_field.id}]"
-    field_name << "[]" if custom_field.multiple?
-    field_id = "#{name}_custom_field_values_#{custom_field.id}"
-
-    tag_options = {:id => field_id, :class => "#{custom_field.field_format}_cf"}
-
-    unset_tag = ''
-    unless custom_field.is_required?
-      unset_tag = content_tag('label',
-        check_box_tag(field_name, '__none__', (value == '__none__'), :id => nil, :data => {:disables => "##{field_id}"}) + l(:button_clear),
-        :class => 'inline'
-      )
-    end
-
-    field_format = Redmine::CustomFieldFormat.find_by_name(custom_field.field_format)
-    case field_format.try(:edit_as)
-      when "date"
-        text_field_tag(field_name, value, tag_options.merge(:size => 10)) +
-        calendar_for(field_id) +
-        unset_tag
-      when "text"
-        text_area_tag(field_name, value, tag_options.merge(:rows => 3)) +
-        '<br />'.html_safe +
-        unset_tag
-      when "bool"
-        select_tag(field_name, options_for_select([[l(:label_no_change_option), ''],
-                                                   [l(:general_text_yes), '1'],
-                                                   [l(:general_text_no), '0']], value), tag_options)
-      when "list"
-        options = []
-        options << [l(:label_no_change_option), ''] unless custom_field.multiple?
-        options << [l(:label_none), '__none__'] unless custom_field.is_required?
-        options += custom_field.possible_values_options(projects)
-        select_tag(field_name, options_for_select(options, value), tag_options.merge(:multiple => custom_field.multiple?))
-      else
-        text_field_tag(field_name, value, tag_options) +
-        unset_tag
-    end
+  # Returns the custom field tag for when bulk editing objects
+  def custom_field_tag_for_bulk_edit(prefix, custom_field, objects=nil, value='')
+    custom_field.format.bulk_edit_tag self,
+      custom_field_tag_id(prefix, custom_field),
+      custom_field_tag_name(prefix, custom_field),
+      custom_field,
+      objects,
+      value,
+      :class => "#{custom_field.field_format}_cf"
   end
 
   # Return a string used to display a custom value
-  def show_value(custom_value)
-    return "" unless custom_value
-    format_value(custom_value.value, custom_value.custom_field.field_format)
+  def show_value(custom_value, html=true)
+    format_object(custom_value, html)
   end
 
   # Return a string used to display a custom value
-  def format_value(value, field_format)
-    if value.is_a?(Array)
-      value.collect {|v| format_value(v, field_format)}.compact.sort.join(', ')
-    else
-      Redmine::CustomFieldFormat.format_value(value, field_format)
-    end
+  def format_value(value, custom_field)
+    format_object(custom_field.format.formatted_value(self, custom_field, value, false), false)
   end
 
   # Return an array of custom field formats which can be used in select_tag
   def custom_field_formats_for_select(custom_field)
-    Redmine::CustomFieldFormat.as_select(custom_field.class.customized_class.name)
+    Redmine::FieldFormat.as_select(custom_field.class.customized_class.name)
   end
 
   # Renders the custom_values in api views
@@ -179,4 +137,12 @@
       end
     end unless custom_values.empty?
   end
+
+  def edit_tag_style_tag(form, options={})
+    select_options = [[l(:label_drop_down_list), ''], [l(:label_checkboxes), 'check_box']]
+    if options[:include_radio]
+      select_options << [l(:label_radio_buttons), 'radio']
+    end
+    form.select :edit_tag_style, select_options, :label => :label_display
+  end
 end