Try #3

app/models/projects/acts_as_customizable_patches.rb

@@ -138,9 +138,7 @@ def available_custom_fields(global: false)
       # hidden fields, they will be cleared from the association. The `custom_field_values` will contain the
       # hidden fields, only if they are returned from this method. Hence we should not hide them,
       # when accessed with the _query_available_custom_fields_on_global_level flag on.
-      unless _query_available_custom_fields_on_global_level
-        custom_fields = custom_fields.visible
-      end
+      custom_fields = custom_fields.visible
 
       # available_custom_fields is called from within the acts_as_customizable module
       # we don't want to adjust these calls, but need a way to query the available custom fields on a global level in some cases
@@ -149,7 +147,7 @@ def available_custom_fields(global: false)
       #
       # additionally we provide the `global` parameter to allow querying the available custom fields on a global level
       # when we have explicit control over the call of `available_custom_fields`
-      unless global || new_record? || _query_available_custom_fields_on_global_level
+      unless global || new_record?
         custom_fields = custom_fields
           .where(id: project_custom_field_project_mappings.select(:custom_field_id))
           .or(ProjectCustomField.required)