Merge pull request #17289 from opf/bug/59765-custom-fields-of-type-hi…

…erarchy-are-configurable-as-searchable [#59765] disable hierarchy cfs from custom actions
opf · Nov 28, 2024 · e6b4289 · e6b4289
2 parents 4400678 + fc165bf
commit e6b4289
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/app/models/custom_actions/actions/custom_field.rb b/app/models/custom_actions/actions/custom_field.rb
@@ -49,7 +49,7 @@ def apply(work_package)
 
   def self.all
     WorkPackageCustomField
-      .order(:name)
+      .usable_as_custom_action
       .map do |cf|
         create_subclass(cf)
       end

diff --git a/app/models/work_package_custom_field.rb b/app/models/work_package_custom_field.rb
@@ -49,6 +49,11 @@ class WorkPackageCustomField < CustomField
     end
   }
 
+  scope :usable_as_custom_action, -> {
+    where.not(field_format: %w[hierarchy])
+    order(:name)
+  }
+
   def self.summable
     where(field_format: %w[int float])
   end

diff --git a/spec/models/custom_actions/actions/custom_field_spec.rb b/spec/models/custom_actions/actions/custom_field_spec.rb
@@ -98,7 +98,7 @@
   describe ".all" do
     before do
       allow(WorkPackageCustomField)
-        .to receive(:order)
+        .to receive(:usable_as_custom_action)
         .and_return(custom_fields)
     end