From 578a6573c4cabffec9fa29d6eae446988bb4015c Mon Sep 17 00:00:00 2001
From: Alban Peignier
Date: Fri, 11 May 2018 09:37:32 +0200
Subject: Remove CustomField.none when workgroup isn't defined in
 CustomFieldsSupport.custom_fields

---
 app/models/concerns/custom_fields_support.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/concerns/custom_fields_support.rb b/app/models/concerns/custom_fields_support.rb
index 6b6621d0c..f5a76f324 100644
--- a/app/models/concerns/custom_fields_support.rb
+++ b/app/models/concerns/custom_fields_support.rb
@@ -6,7 +6,7 @@ module CustomFieldsSupport
     after_initialize :initialize_custom_fields
 
     def self.custom_fields workgroup
-      return [] unless workgroup
+      return CustomField.none unless workgroup
       fields = CustomField.where(resource_type: self.name.split("::").last)
       fields = fields.where(workgroup_id: workgroup.id)
       fields
-- 
cgit v1.2.3