Use skip_object_fields on multi-object fields too

Author: bctiemann

netbox_custom_objects/field_types.py

@@ -717,7 +717,7 @@ def get_form_field(self, field, for_csv_import=False, **kwargs):
                 "model", ""
             )
             custom_object_type = CustomObjectType.objects.get(pk=custom_object_type_id)
-            model = custom_object_type.get_model()
+            model = custom_object_type.get_model(skip_object_fields=True)
         else:
             # This is a regular NetBox model
             model = content_type.model_class()
@@ -755,9 +755,13 @@ def get_table_column_field(self, field, **kwargs):
 
     def get_serializer_field(self, field, **kwargs):
         related_model_class = field.related_object_type.model_class()
-        if not related_model_class:
-            raise NotImplementedError("Custom object serializers not implemented")
-        serializer = get_serializer_for_model(related_model_class)
+        if related_model_class._meta.app_label == APP_LABEL:
+            from netbox_custom_objects.api.serializers import get_serializer_class
+            serializer = get_serializer_class(related_model_class, skip_object_fields=True)
+        # if not related_model_class:
+        #     raise NotImplementedError("Custom object serializers not implemented")
+        else:
+            serializer = get_serializer_for_model(related_model_class)
         return serializer(required=field.required, nested=True, many=True)
 
     def after_model_generation(self, instance, model, field_name):

netbox_custom_objects/models.py

@@ -335,11 +335,11 @@ def _fetch_and_generate_field_attrs(
         fields = list(fields) + [field for field in fields_query]
 
         for field in fields:
-            field_type = FIELD_TYPE_CLASS[field.type]()
             if skip_object_fields:
                 if field.type in [CustomFieldTypeChoices.TYPE_OBJECT, CustomFieldTypeChoices.TYPE_MULTIOBJECT]:
                     continue
 
+            field_type = FIELD_TYPE_CLASS[field.type]()
             field_name = field.name
 
             field_attrs["_field_objects"][field.id] = {