Use instance workgroup in custom_field instance method. Refs #6669

1 files changed, 3 insertions, 2 deletions

diff --git a/app/models/concerns/custom_fields_support.rb b/app/models/concerns/custom_fields_support.rb
index 8d4b37657..8bfd0abf8 100644
--- a/app/models/concerns/custom_fields_support.rb
+++ b/app/models/concerns/custom_fields_support.rb
@@ -26,8 +26,9 @@ module CustomFieldsSupport
       end
     end
 
-    def custom_fields workgroup=nil
-      CustomField::Collection.new self, workgroup
+    def custom_fields deprecated_workgroup=nil
+      _workgroup = deprecated_workgroup || self.workgroup
+      CustomField::Collection.new self, _workgroup
     end
 
     def custom_fields_checksum