Merge pull request #16570 from opf/bug/57508-custom-fields-with-forma…

…t-string-text-bool-link-and-date-dont-forbid-multi-select-internally-and-have-handling-in-ordering Bug/57508 custom fields with format string text bool link and date dont forbid multi select internally and have handling in ordering
opf · Sep 12, 2024 · 0eaadba · 0eaadba
2 parents c3f2c37 + 0b859db
commit 0eaadba
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 20 deletions.
diff --git a/app/models/custom_field.rb b/app/models/custom_field.rb
@@ -69,6 +69,9 @@ def uniqueness_of_name_with_scope
   validates :min_length, numericality: { less_than_or_equal_to: :max_length, message: :smaller_than_or_equal_to_max_length },
                          unless: Proc.new { |cf| cf.max_length.blank? }
 
+  validates :multi_value, absence: true, unless: :multi_value_possible?
+  validates :allow_non_open_versions, absence: true, unless: :allow_non_open_versions_possible?
+
   before_validation :check_searchability
   after_destroy :destroy_help_text
 
@@ -265,6 +268,10 @@ def list?
     field_format == "list"
   end
 
+  def user?
+    field_format == "user"
+  end
+
   def version?
     field_format == "version"
   end
@@ -277,22 +284,12 @@ def boolean?
     field_format == "bool"
   end
 
-  def multi_value?
-    multi_value
-  end
-
   def multi_value_possible?
-    %w[version user list].include?(field_format) &&
-      [ProjectCustomField, WorkPackageCustomField, TimeEntryCustomField, VersionCustomField].include?(self.class)
-  end
-
-  def allow_non_open_versions?
-    allow_non_open_versions
+    version? || user? || list?
   end
 
   def allow_non_open_versions_possible?
-    version? &&
-      [ProjectCustomField, WorkPackageCustomField, TimeEntryCustomField, VersionCustomField].include?(self.class)
+    version?
   end
 
   ##

diff --git a/app/models/custom_field/order_statements.rb b/app/models/custom_field/order_statements.rb
@@ -38,12 +38,8 @@ def order_statements
       else
         [select_custom_option_position]
       end
-    when "string", "text", "date", "bool", "link"
-      if multi_value?
-        [select_custom_values_as_group]
-      else
-        [coalesce_select_custom_value_as_string]
-      end
+    when "string", "date", "bool", "link"
+      [coalesce_select_custom_value_as_string]
     when "int", "float"
       # Make the database cast values into numeric
       # Postgresql will raise an error if a value can not be casted!

diff --git a/app/views/custom_fields/_form.html.erb b/app/views/custom_fields/_form.html.erb
@@ -85,7 +85,7 @@ See COPYRIGHT and LICENSE files for more details.
     </span>
   </div>
 
-  <% if @custom_field.new_record? || @custom_field.list? || @custom_field.multi_value_possible? %>
+  <% if @custom_field.new_record? || @custom_field.multi_value_possible? %>
     <div class="form--field" <%= format_dependent.attributes(:multiSelect) %>>
       <%= f.check_box :multi_value,
                       data: { action: 'admin--custom-fields#checkOnlyOne' } %>
@@ -118,7 +118,7 @@ See COPYRIGHT and LICENSE files for more details.
     </fieldset>
   <% end %>
 
-  <% if @custom_field.new_record? || @custom_field.version? || @custom_field.allow_non_open_versions_possible? %>
+  <% if @custom_field.new_record? || @custom_field.allow_non_open_versions_possible? %>
     <div class="form--field" <%= format_dependent.attributes(:allowNonOpenVersions) %>>
       <%= f.check_box :allow_non_open_versions %>
     </div>