@@ -55,12 +55,10 class ContextMenusController < ApplicationController | |||
|
55 | 55 | |
|
56 | 56 | @options_by_custom_field = {} |
|
57 | 57 | if @can[:edit] |
|
58 |
custom_fields = @issues.map(&:available_custom_fields).reduce(:&). |
|
|
59 | %w(bool list user version).include?(f.field_format) && !f.multiple? | |
|
60 | end | |
|
58 | custom_fields = @issues.map(&:available_custom_fields).reduce(:&).reject(&:multiple?) | |
|
61 | 59 | custom_fields.each do |field| |
|
62 | 60 | values = field.possible_values_options(@projects) |
|
63 |
if values. |
|
|
61 | if values.present? | |
|
64 | 62 | @options_by_custom_field[field] = values |
|
65 | 63 | end |
|
66 | 64 | end |
@@ -118,7 +118,7 module Redmine | |||
|
118 | 118 | end |
|
119 | 119 | |
|
120 | 120 | def possible_values_options(custom_field, object=nil) |
|
121 | custom_field.possible_values | |
|
121 | [] | |
|
122 | 122 | end |
|
123 | 123 | |
|
124 | 124 | # Returns the validation errors for custom_field |
@@ -476,7 +476,7 module Redmine | |||
|
476 | 476 | self.form_partial = 'custom_fields/formats/list' |
|
477 | 477 | |
|
478 | 478 | def possible_custom_value_options(custom_value) |
|
479 | options = super | |
|
479 | options = possible_values_options(custom_value.custom_field) | |
|
480 | 480 | missing = [custom_value.value].flatten.reject(&:blank?) - options |
|
481 | 481 | if missing.any? |
|
482 | 482 | options += missing |
@@ -484,6 +484,10 module Redmine | |||
|
484 | 484 | options |
|
485 | 485 | end |
|
486 | 486 | |
|
487 | def possible_values_options(custom_field, object=nil) | |
|
488 | custom_field.possible_values | |
|
489 | end | |
|
490 | ||
|
487 | 491 | def validate_custom_field(custom_field) |
|
488 | 492 | errors = [] |
|
489 | 493 | errors << [:possible_values, :blank] if custom_field.possible_values.blank? |
General Comments 0
You need to be logged in to leave comments.
Login now