Merge branch 'main' into docs

Author: mrmrcoleman

netbox_custom_objects/LICENSE.md

@@ -1,48 +1,42 @@
 from netbox.plugins import PluginConfig
-from django.apps import apps
+
 
 # Plugin Configuration
 class CustomObjectsPluginConfig(PluginConfig):
     name = "netbox_custom_objects"
     verbose_name = "Custom Objects"
     description = "A plugin to manage custom objects in NetBox"
-    version = "0.1"
+    version = "0.1.0"
     base_url = "custom-objects"
     min_version = "4.2.0"
-    # max_version = "3.5.0"
     default_settings = {}
     required_settings = []
     template_extensions = "template_content.template_extensions"
 
-    '''
-    def get_model(self, model_name, require_ready=True):
-        if require_ready:
-            self.apps.check_models_ready()
-        else:
-            self.apps.check_apps_ready()
-
-        if model_name.lower() in self.models:
-            return self.models[model_name.lower()]
-        
-        from .models import CustomObjectType
-        if "table" not in model_name.lower() or "model" not in model_name.lower():
-            raise LookupError(
-                "App '%s' doesn't have a '%s' model." % (self.label, model_name)
-            )
-
-        custom_object_type_id = int(model_name.replace("table", "").replace("model", ""))
-
-        try:
-            obj = CustomObjectType.objects.get(pk=custom_object_type_id)
-        except CustomObjectType.DoesNotExist:
-            raise LookupError(
-                "App '%s' doesn't have a '%s' model." % (self.label, model_name)
-            )
-        return obj.get_model()
-    
-    def ready(self):
-        super().ready()
-    '''
+    # def get_model(self, model_name, require_ready=True):
+    #     if require_ready:
+    #         self.apps.check_models_ready()
+    #     else:
+    #         self.apps.check_apps_ready()
+    #
+    #     if model_name.lower() in self.models:
+    #         return self.models[model_name.lower()]
+    #
+    #     from .models import CustomObjectType
+    #     if "table" not in model_name.lower() or "model" not in model_name.lower():
+    #         raise LookupError(
+    #             "App '%s' doesn't have a '%s' model." % (self.label, model_name)
+    #         )
+    #
+    #     custom_object_type_id = int(model_name.replace("table", "").replace("model", ""))
+    #
+    #     try:
+    #         obj = CustomObjectType.objects.get(pk=custom_object_type_id)
+    #     except CustomObjectType.DoesNotExist:
+    #         raise LookupError(
+    #             "App '%s' doesn't have a '%s' model." % (self.label, model_name)
+    #         )
+    #     return obj.get_model()
 
 
 config = CustomObjectsPluginConfig

netbox_custom_objects/__init__.py

@@ -1,19 +1,14 @@
-import json
-
 from django import forms
 from django.utils.translation import gettext_lazy as _
-from extras.choices import CustomFieldTypeChoices, CustomFieldUIEditableChoices
+from extras.choices import CustomFieldTypeChoices
 from extras.forms import CustomFieldForm
 from netbox.forms import NetBoxModelForm
-from utilities.forms.fields import (CommentField, ContentTypeChoiceField,
-                                    DynamicModelChoiceField)
+from utilities.forms.fields import CommentField, ContentTypeChoiceField, DynamicModelChoiceField
 from utilities.forms.rendering import FieldSet
 from utilities.object_types import object_type_name
 
 from netbox_custom_objects.constants import APP_LABEL
-from netbox_custom_objects.models import (CustomObjectObjectType,
-                                          CustomObjectType,
-                                          CustomObjectTypeField)
+from netbox_custom_objects.models import CustomObjectObjectType, CustomObjectType, CustomObjectTypeField
 
 __all__ = (
     "CustomObjectTypeForm",

netbox_custom_objects/forms.py

@@ -1,56 +1,36 @@
 import decimal
-import json
 import re
 import uuid
 from datetime import date, datetime
 
 import django_filters
 from core.models.contenttypes import ObjectTypeManager
-from django import forms
 from django.apps import apps
 from django.conf import settings
 from django.contrib.contenttypes.management import create_contenttypes
 from django.contrib.contenttypes.models import ContentType
 from django.core.validators import RegexValidator, ValidationError
 from django.db import connection, models
-from django.db.models import F, Func, Q, Value
-from django.db.models.expressions import RawSQL
+from django.db.models import Q
 from django.db.models.functions import Lower
 from django.urls import reverse
-from django.utils.html import escape
-from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _
-from extras.choices import (CustomFieldFilterLogicChoices,
-                            CustomFieldTypeChoices,
-                            CustomFieldUIEditableChoices,
-                            CustomFieldUIVisibleChoices)
-from extras.constants import CUSTOMFIELD_EMPTY_VALUES
-# from .choices import MappingFieldTypeChoices
+from extras.choices import (
+    CustomFieldFilterLogicChoices, CustomFieldTypeChoices, CustomFieldUIEditableChoices, CustomFieldUIVisibleChoices,
+)
 from extras.models.customfields import SEARCH_TYPES
 from netbox.models import ChangeLoggedModel, NetBoxModel
-from netbox.models.features import (BookmarksMixin, ChangeLoggingMixin,
-                                    CloningMixin,
-                                    CustomLinksMixin, CustomValidationMixin,
-                                    EventRulesMixin, ExportTemplatesMixin,
-                                    JournalingMixin, NotificationsMixin,
-                                    TagsMixin)
+# from netbox.models.features import (
+#     BookmarksMixin, ChangeLoggingMixin, CloningMixin, CustomLinksMixin, CustomValidationMixin, EventRulesMixin,
+#     ExportTemplatesMixin, JournalingMixin, NotificationsMixin, TagsMixin,
+# )
+from netbox.models.features import CloningMixin, ExportTemplatesMixin, TagsMixin
 from netbox.registry import registry
 from utilities import filters
 from utilities.datetime import datetime_from_timestamp
-from utilities.forms.fields import (CSVChoiceField, CSVModelChoiceField,
-                                    CSVModelMultipleChoiceField,
-                                    CSVMultipleChoiceField, DynamicChoiceField,
-                                    DynamicModelChoiceField,
-                                    DynamicModelMultipleChoiceField,
-                                    DynamicMultipleChoiceField, JSONField,
-                                    LaxURLField)
-from utilities.forms.utils import add_blank_choice
-from utilities.forms.widgets import (APISelect, APISelectMultiple, DatePicker,
-                                     DateTimePicker)
 from utilities.object_types import object_type_name
 from utilities.querysets import RestrictedQuerySet
 from utilities.string import title
-from utilities.templatetags.builtins.filters import render_markdown
 from utilities.validators import validate_regex
 
 from netbox_custom_objects.constants import APP_LABEL
@@ -59,6 +39,7 @@
 
 USER_TABLE_DATABASE_NAME_PREFIX = "custom_objects_"
 
+
 class CustomObject(
     # BookmarksMixin,
     # ChangeLoggingMixin,

netbox_custom_objects/models.py

@@ -55,7 +55,7 @@ def get_menu():
             (_("Object Types"), (custom_object_type_plugin_menu_item,)),
             (_("Objects"), tuple(menu_items)),
         ),
-        icon_class="mdi mdi-source-branch",
+        icon_class="mdi mdi-toy-brick-outline",
     )
 
 
@@ -64,7 +64,7 @@ def get_menu():
     menu = PluginMenu(
         label="Custom Objects",
         groups=((_("Object Types"), (custom_object_type_plugin_menu_item,)),),
-        icon_class="mdi mdi-source-branch",
+        icon_class="mdi mdi-toy-brick-outline",
     )
 else:
     menu = get_menu

netbox_custom_objects/navigation.py

@@ -170,7 +170,6 @@ def get(self, request, *args, **kwargs):
             **self.get_extra_context(request, obj),
         })
 
-
     def _get_dependent_objects(self, obj):
         dependent_objects = super()._get_dependent_objects(obj)
         model = obj.custom_object_type.get_model()
@@ -347,13 +346,11 @@ def get_form(self, model):
                 print(f"get_form: {field.name} field is not supported")
 
         # Add an __init__ method to handle the tags field widget override
-        from django.forms.widgets import HiddenInput
-        
         def __init__(self, *args, **kwargs):
             forms.NetBoxModelForm.__init__(self, *args, **kwargs)
             if 'tags' in self.fields:
                 del self.fields["tags"]
-        
+
         attrs['__init__'] = __init__
 
         form = type(

netbox_custom_objects/views.py

@@ -0,0 +1,10 @@
+line-length = 120
+target-version = "py310"
+
+[lint]
+extend-select = ["E1", "E2", "E3", "E501", "W"]
+ignore = ["F403", "F405"]
+preview = true
+
+[format]
+quote-style = "single"