jro_apps/redmine Commit - r12127:ebb8e8612254

Removed hardcoded formats for right-click edit....

Jean-Philippe Lang -

r12127:ebb8e8612254

parent child

Context file:

r12127:ebb8e8612254

app/controllers/context_menus_controller.rb +2 -4

                 @options_by_custom_field = {}
                 if @can[:edit]
-                  custom_fields = @issues.map(&:available_custom_fields).reduce(:&).select do |f|
+                  custom_fields = @issues.map(&:available_custom_fields).reduce(:&).reject(&:multiple?)
-                    %w(bool list user version).include?(f.field_format) && !f.multiple?
-                  end
                   custom_fields.each do |field|
                     values = field.possible_values_options(@projects)
-                    if values.any?
+                    if values.present?
                       @options_by_custom_field[field] = values
                     end
                   end

lib/redmine/field_format.rb +6 -2

                   end
                   def possible_values_options(custom_field, object=nil)
-                    custom_field.possible_values
+                    []
                   end
                   # Returns the validation errors for custom_field
                   self.form_partial = 'custom_fields/formats/list'
                   def possible_custom_value_options(custom_value)
-                    options = super
+                    options = possible_values_options(custom_value.custom_field)
                     missing = [custom_value.value].flatten.reject(&:blank?) - options
                     if missing.any?
                       options += missing
                     options
                   end
+                  def possible_values_options(custom_field, object=nil)
+                    custom_field.possible_values
+                  end
                   def validate_custom_field(custom_field)
                     errors = []
                     errors << [:possible_values, :blank] if custom_field.possible_values.blank?

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages