Merge pull request #90 from Kani999/netbox_4_4

Migration to NetBox v4.4

Author: Kani999

.gitignore

@@ -5,3 +5,5 @@ __pycache__
 dist/
 build/
 .vscode/
+/contrib/
+/pynetbox_test.py

README.md

@@ -25,6 +25,7 @@ The following table shows the compatibility between different NetBox versions an
 | >= 4.1.0       | 6.x.x          |
 | >= 4.2.0       | 7.x.x          |
 | >= 4.3.0       | 8.x.x          |
+| >= 4.4.0       | 9.x.x          |
 
 ## Installation
 
@@ -57,6 +58,22 @@ Restart NetBox and ensure that `netbox-attachments` is included in your `local_r
 
 For more details, see the [NetBox Documentation](https://docs.netbox.dev/en/stable/plugins/#installing-plugins).
 
+## NetBox 4.4 Compatibility Changes
+
+Starting from version 9.0.0, the plugin has been updated for full NetBox 4.4 compatibility with the following changes:
+
+### Template Extension Updates
+- **Models Attribute**: Updated template extensions to use the `models` list attribute instead of the deprecated `model` attribute for NetBox 4.x compatibility.
+- **Error Handling**: Improved error handling for template rendering when object types are missing.
+- **Template Panel Rendering**: Fixed AttributeError issues in `render_attachment_panel` function for proper template extension compatibility.
+
+### API and URL Improvements
+- **Bulk Action URLs**: Added proper URL patterns for bulk edit and bulk delete operations.
+- **URL Pattern Reorganization**: Improved URL pattern ordering for better routing logic.
+- **Default Return URLs**: Enhanced navigation flow after bulk operations.
+
+These changes ensure the plugin works seamlessly with NetBox 4.4 while maintaining all core attachment functionality and improving the user experience.
+
 
 ## New Validation Checks
 
@@ -104,17 +121,50 @@ The plugin can be customized using the following configuration options:
   - **Description**: Override the display settings for specific models.
   - **Tip**: Use the correct `app_label` and `model` names, which can be found in the API at `<your_netbox_url>/api/extras/content-types/`.
 
-> ~~**Warning**: The `additional_tab` option does not work for plugin models.~~
+
+## API Usage
+
+Since the import functionality has been removed, you can use the NetBox API to programmatically manage attachments:
+
+### Creating Attachments via API
+
+```python
+import requests
+
+# Example: Upload attachment via API
+url = "https://your-netbox-url/api/plugins/netbox-attachments/attachments/"
+headers = {
+    "Authorization": "Token your-api-token",
+    "Content-Type": "application/json"
+}
+
+# For file uploads, use multipart/form-data
+files = {
+    'file': ('filename.pdf', open('path/to/file.pdf', 'rb'))
+}
+data = {
+    'object_type': 'dcim.device',  # ContentType ID or app_label.model
+    'object_id': 123,
+    'name': 'Device Manual',
+    'description': 'User manual for the device'
+}
+
+response = requests.post(url, headers=headers, files=files, data=data)
+```
 
 > **Note**: The `additional_tab` feature will work for plugin models if you include the following in your `urls.py`:
 >
 > ```python
+> from netbox.urls import get_model_urls
+> 
 > path(
 >    "MODEL/<int:pk>/",
 >    include(get_model_urls("plugin_name", "model_name")),
 > ),
 > ```
 >
+> **Note**: `plugin_name` refers to the plugin slug used in URLs (often hyphenated), which may differ from the Python package/module name.
+>
 > By doing so, the system will automatically include the Changelog, Journal, and other registered tabs (such as Attachments) when `additional_tab` is enabled.
 
 ### Configuration Example

netbox_attachments/__init__.py

@@ -25,8 +25,8 @@ class NetBoxAttachmentsConfig(PluginConfig):
         "display_setting": {},
     }
     required_settings = []
-    min_version = "4.3.0"
-    max_version = "4.3.99"
+    min_version = "4.4.0"
+    max_version = "4.4.99"
 
 
 config = NetBoxAttachmentsConfig

netbox_attachments/api/serializers.py

@@ -1,4 +1,4 @@
-from core.models.contenttypes import ObjectType
+from core.models.object_types import ObjectType
 from django.core.exceptions import ObjectDoesNotExist
 from netbox.api.fields import ContentTypeField
 from netbox.api.serializers import NetBoxModelSerializer
@@ -45,17 +45,36 @@ def validate(self, data):
                 )
             )
 
-        # Enforce model validation
-        super().validate(data)
+        # Enforce model validation and capture any upstream mutations
+        validated_data = super().validate(data)
 
-        return data
+        return validated_data
 
     # @swagger_serializer_method(serializer_or_field=serializers.JSONField)
     def get_parent(self, obj):
-        if obj.parent:
-            serializer = get_serializer_for_model(obj.parent)
-            return serializer(
-                obj.parent, nested=True, context={"request": self.context["request"]}
-            ).data
-        else:
+        # Check for required fields first to avoid unnecessary DB lookups
+        if not (
+            hasattr(obj, "object_type_id")
+            and obj.object_type_id
+            and hasattr(obj, "object_id")
+            and obj.object_id
+        ):
             return None
+
+        # Only wrap the parent dereference in try/except to let other errors bubble
+        try:
+            parent = obj.parent
+        except ObjectDoesNotExist:
+            # Handle case where parent object doesn't exist
+            return None
+
+        if parent is None:
+            return None
+
+        # Get serializer for the parent's class, not the instance
+        serializer = get_serializer_for_model(parent.__class__)
+        return serializer(
+            parent,
+            nested=True,
+            context=self.context,
+        ).data

netbox_attachments/forms.py

@@ -1,7 +1,11 @@
-from core.models.contenttypes import ObjectType
+from core.models.object_types import ObjectType
 from django import forms
 from django.utils.translation import gettext as _
-from netbox.forms import NetBoxModelFilterSetForm, NetBoxModelForm
+from netbox.forms import (
+    NetBoxModelBulkEditForm,
+    NetBoxModelFilterSetForm,
+    NetBoxModelForm,
+)
 from utilities.forms.fields import (
     CommentField,
     DynamicModelMultipleChoiceField,
@@ -58,3 +62,17 @@ class NetBoxAttachmentFilterForm(NetBoxModelFilterSetForm):
         ),
     )
     tag = TagFilterField(model)
+
+
+class NetBoxAttachmentBulkEditForm(NetBoxModelBulkEditForm):
+    name = forms.CharField(
+        max_length=NetBoxAttachment._meta.get_field("name").max_length, required=False
+    )
+    description = forms.CharField(
+        widget=forms.Textarea,
+        max_length=NetBoxAttachment._meta.get_field("description").max_length,
+        required=False,
+    )
+
+    model = NetBoxAttachment
+    nullable_fields = ("name", "description")

netbox_attachments/models.py

@@ -1,7 +1,7 @@
 import numbers
 import os
 
-from core.models.contenttypes import ObjectType
+from core.models.object_types import ObjectType
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.db import models
 from django.db.models.signals import pre_delete
@@ -57,14 +57,18 @@ def filename(self):
 
     @property
     def parent(self):
+        # Guard using object_type_id and object_id
+        if not (self.object_type_id and self.object_id):
+            return None
+
         if self.object_type.model_class() is None:
-            # Model for the content type does not exists
-            # Model was probably deleted or uninstalled -> parent object cannot be found
+            # Model was probably deleted or uninstalled — parent object cannot be found
             return None
+
         try:
             return self.object_type.get_object_for_this_type(id=self.object_id)
         except ObjectDoesNotExist:
-            # Object for the content type Model does not exists
+            # Handle case where parent object doesn't exist
             return None
 
     def get_absolute_url(self):

netbox_attachments/template_content.py

@@ -1,7 +1,7 @@
 import logging
 from typing import List, Type
 
-from core.models.contenttypes import ObjectType
+from core.models.object_types import ObjectType
 from django.apps import apps
 from django.conf import settings
 from django.db.models import Model

netbox_attachments/urls.py

@@ -1,15 +1,34 @@
-from django.urls import path
-from netbox.views.generic import ObjectChangeLogView
+from django.urls import include, path
+from utilities.urls import get_model_urls
 
-from netbox_attachments import models, views
+from netbox_attachments import views
 
 urlpatterns = (
-    # Files
+    path(
+        "netbox-attachments/",
+        views.NetBoxAttachmentListView.as_view(),
+        name="netboxattachment_list",
+    ),
     path(
         "netbox-attachments/add/",
         views.NetBoxAttachmentEditView.as_view(),
         name="netboxattachment_add",
     ),
+    path(
+        "netbox-attachments/edit/",
+        views.NetBoxAttachmentBulkEditView.as_view(),
+        name="netboxattachment_bulk_edit",
+    ),
+    path(
+        "netbox-attachments/delete/",
+        views.NetBoxAttachmentBulkDeleteView.as_view(),
+        name="netboxattachment_bulk_delete",
+    ),
+    path(
+        "netbox-attachments/<int:pk>/",
+        views.NetBoxAttachmentView.as_view(),
+        name="netboxattachment",
+    ),
     path(
         "netbox-attachments/<int:pk>/edit/",
         views.NetBoxAttachmentEditView.as_view(),
@@ -22,18 +41,10 @@
     ),
     path(
         "netbox-attachments/",
-        views.NetBoxAttachmentListView.as_view(),
-        name="netboxattachment_list",
+        include(get_model_urls("netbox_attachments", "netboxattachment", detail=False)),
     ),
     path(
         "netbox-attachments/<int:pk>/",
-        views.NetBoxAttachmentView.as_view(),
-        name="netboxattachment",
-    ),
-    path(
-        "netbox-attachments/<int:pk>/changelog/",
-        ObjectChangeLogView.as_view(),
-        name="netboxattachment_changelog",
-        kwargs={"model": models.NetBoxAttachment},
+        include(get_model_urls("netbox_attachments", "netboxattachment")),
     ),
 )

netbox_attachments/version.py

@@ -1 +1 @@
-__version__ = "8.0.4"
+__version__ = "9.0.0"

netbox_attachments/views.py

@@ -1,18 +1,19 @@
-from core.models.contenttypes import ObjectType
+from core.models.object_types import ObjectType
 from django.shortcuts import get_object_or_404
 from netbox.views import generic
+from utilities.views import register_model_view
 
 from netbox_attachments import filtersets, forms, models, tables
 
 
+@register_model_view(models.NetBoxAttachment, name="", detail=True)
 class NetBoxAttachmentView(generic.ObjectView):
-    controls = []
     queryset = models.NetBoxAttachment.objects.all()
 
 
+@register_model_view(models.NetBoxAttachment, name="list", path="", detail=False)
 class NetBoxAttachmentListView(generic.ObjectListView):
     actions = {
-        "import": {"add"},
         "export": set(),
         "bulk_edit": {"change"},
         "bulk_delete": {"delete"},
@@ -23,6 +24,8 @@ class NetBoxAttachmentListView(generic.ObjectListView):
     filterset_form = forms.NetBoxAttachmentFilterForm
 
 
+@register_model_view(models.NetBoxAttachment, name="add", detail=False)
+@register_model_view(models.NetBoxAttachment, name="edit", detail=True)
 class NetBoxAttachmentEditView(generic.ObjectEditView):
     queryset = models.NetBoxAttachment.objects.all()
     form = forms.NetBoxAttachmentForm
@@ -46,6 +49,24 @@ def get_extra_addanother_params(self, request):
         }
 
 
+@register_model_view(models.NetBoxAttachment, name="delete", detail=True)
 class NetBoxAttachmentDeleteView(generic.ObjectDeleteView):
     queryset = models.NetBoxAttachment.objects.all()
+
+
+@register_model_view(models.NetBoxAttachment, "bulk_edit", path="edit", detail=False)
+class NetBoxAttachmentBulkEditView(generic.BulkEditView):
+    queryset = models.NetBoxAttachment.objects.all()
+    filterset = filtersets.NetBoxAttachmentFilterSet
+    table = tables.NetBoxAttachmentTable
+    form = forms.NetBoxAttachmentBulkEditForm
+
+
+@register_model_view(
+    models.NetBoxAttachment, "bulk_delete", path="delete", detail=False
+)
+class NetBoxAttachmentBulkDeleteView(generic.BulkDeleteView):
+    queryset = models.NetBoxAttachment.objects.all()
+    filterset = filtersets.NetBoxAttachmentFilterSet
+    table = tables.NetBoxAttachmentTable
     default_return_url = "plugins:netbox_attachments:netboxattachment_list"