rename

Author: arthanson

netbox_custom_objects/field_types.py

@@ -32,7 +32,7 @@
 from utilities.templatetags.builtins.filters import linkify, render_markdown
 
 from netbox_custom_objects.constants import APP_LABEL
-from netbox_custom_objects.utilities import get_custom_object_type_from_content_type
+from netbox_custom_objects.utilities import get_custom_object_type_id_from_content_type
 
 
 class FieldType:
@@ -344,7 +344,7 @@ def get_model_field(self, field, **kwargs):
         if content_type.app_label == APP_LABEL:
             from netbox_custom_objects.models import CustomObjectType
 
-            custom_object_type_id = get_custom_object_type_from_content_type(
+            custom_object_type_id = get_custom_object_type_id_from_content_type(
                 content_type
             )
             custom_object_type = CustomObjectType.objects.get(pk=custom_object_type_id)
@@ -372,7 +372,7 @@ def get_form_field(self, field, for_csv_import=False, **kwargs):
             # This is a custom object type
             from netbox_custom_objects.models import CustomObjectType
 
-            custom_object_type_id = get_custom_object_type_from_content_type(
+            custom_object_type_id = get_custom_object_type_id_from_content_type(
                 content_type
             )
             custom_object_type = CustomObjectType.objects.get(pk=custom_object_type_id)
@@ -579,7 +579,7 @@ def get_through_model(self, field, model=None):
 
         # Check if this is a self-referential M2M
         content_type = ContentType.objects.get(pk=field.related_object_type_id)
-        custom_object_type_id = get_custom_object_type_from_content_type(content_type)
+        custom_object_type_id = get_custom_object_type_id_from_content_type(content_type)
         is_self_referential = (
             content_type.app_label == APP_LABEL
             and field.custom_object_type.id == custom_object_type_id
@@ -614,7 +614,7 @@ def get_model_field(self, field, **kwargs):
         """
         # Check if this is a self-referential M2M
         content_type = ContentType.objects.get(pk=field.related_object_type_id)
-        custom_object_type_id = get_custom_object_type_from_content_type(content_type)
+        custom_object_type_id = get_custom_object_type_id_from_content_type(content_type)
         # TODO: Default does not auto-populate, to new or existing objects (should it?)
         kwargs.update({"default": field.default, "unique": field.unique})
 
@@ -655,7 +655,7 @@ def get_form_field(self, field, for_csv_import=False, **kwargs):
             # This is a custom object type
             from netbox_custom_objects.models import CustomObjectType
 
-            custom_object_type_id = get_custom_object_type_from_content_type(
+            custom_object_type_id = get_custom_object_type_id_from_content_type(
                 content_type
             )
             custom_object_type = CustomObjectType.objects.get(pk=custom_object_type_id)
@@ -717,7 +717,7 @@ def after_model_generation(self, instance, model, field_name):
         if content_type.app_label == APP_LABEL:
             from netbox_custom_objects.models import CustomObjectType
 
-            custom_object_type_id = get_custom_object_type_from_content_type(
+            custom_object_type_id = get_custom_object_type_id_from_content_type(
                 content_type
             )
             custom_object_type = CustomObjectType.objects.get(pk=custom_object_type_id)
@@ -759,7 +759,7 @@ def create_m2m_table(self, instance, model, field_name):
             if content_type.app_label == APP_LABEL:
                 from netbox_custom_objects.models import CustomObjectType
 
-                custom_object_type_id = get_custom_object_type_from_content_type(
+                custom_object_type_id = get_custom_object_type_id_from_content_type(
                     content_type
                 )
                 custom_object_type = CustomObjectType.objects.get(

netbox_custom_objects/utilities.py

@@ -4,7 +4,7 @@
 
 __all__ = (
     "AppsProxy",
-    "get_custom_object_type_from_content_type",
+    "get_custom_object_type_id_from_content_type",
     "get_viewname",
 )
 
@@ -86,5 +86,5 @@ def get_viewname(model, action=None, rest_api=False):
     return viewname
 
 
-def get_custom_object_type_from_content_type(content_type):
+def get_custom_object_type_id_from_content_type(content_type):
     return int(content_type.model.replace("table", "").replace("model", ""))