Add bulk edit, delete views for journal entries

netbox-community · Mar 17, 2021 · 956e272 · 956e272
1 parent 7f1d9ae
commit 956e272
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 4 deletions.
diff --git a/netbox/extras/forms.py b/netbox/extras/forms.py
@@ -8,7 +8,7 @@
 from tenancy.models import Tenant, TenantGroup
 from utilities.forms import (
     add_blank_choice, APISelectMultiple, BootstrapMixin, BulkEditForm, BulkEditNullBooleanSelect, ColorSelect,
-    CSVModelForm, DateTimePicker, DynamicModelMultipleChoiceField, JSONField, SlugField, StaticSelect2,
+    CommentField, CSVModelForm, DateTimePicker, DynamicModelMultipleChoiceField, JSONField, SlugField, StaticSelect2,
     BOOLEAN_WITH_BLANK_CHOICES,
 )
 from virtualization.models import Cluster, ClusterGroup
@@ -386,6 +386,20 @@ class Meta:
         }
 
 
+class JournalEntryBulkEditForm(BootstrapMixin, BulkEditForm):
+    pk = forms.ModelMultipleChoiceField(
+        queryset=JournalEntry.objects.all(),
+        widget=forms.MultipleHiddenInput
+    )
+    comments = forms.CharField(
+        required=False,
+        widget=forms.Textarea()
+    )
+
+    class Meta:
+        nullable_fields = []
+
+
 class JournalEntryFilterForm(BootstrapMixin, forms.Form):
     model = JournalEntry
     q = forms.CharField(

diff --git a/netbox/extras/tables.py b/netbox/extras/tables.py
@@ -99,6 +99,7 @@ class Meta(BaseTable.Meta):
 
 
 class JournalEntryTable(BaseTable):
+    pk = ToggleColumn()
     created = tables.DateTimeColumn(
         format=settings.SHORT_DATETIME_FORMAT
     )
@@ -117,7 +118,7 @@ class JournalEntryTable(BaseTable):
 
     class Meta(BaseTable.Meta):
         model = JournalEntry
-        fields = ('created', 'created_by', 'assigned_object_type', 'assigned_object', 'comments', 'actions')
+        fields = ('pk', 'created', 'created_by', 'assigned_object_type', 'assigned_object', 'comments', 'actions')
 
 
 class ObjectJournalTable(BaseTable):

diff --git a/netbox/extras/tests/test_views.py b/netbox/extras/tests/test_views.py
@@ -133,8 +133,8 @@ class JournalEntryTestCase(
     ViewTestCases.EditObjectViewTestCase,
     ViewTestCases.DeleteObjectViewTestCase,
     ViewTestCases.ListObjectsViewTestCase,
-    # ViewTestCases.BulkEditObjectsViewTestCase,
-    # ViewTestCases.BulkDeleteObjectsViewTestCase
+    ViewTestCases.BulkEditObjectsViewTestCase,
+    ViewTestCases.BulkDeleteObjectsViewTestCase
 ):
     model = JournalEntry
 

diff --git a/netbox/extras/urls.py b/netbox/extras/urls.py
@@ -34,6 +34,8 @@
     # Journal entries
     path('journal-entries/', views.JournalEntryListView.as_view(), name='journalentry_list'),
     path('journal-entries/add/', views.JournalEntryEditView.as_view(), name='journalentry_add'),
+    path('journal-entries/edit/', views.JournalEntryBulkEditView.as_view(), name='journalentry_bulk_edit'),
+    path('journal-entries/delete/', views.JournalEntryBulkDeleteView.as_view(), name='journalentry_bulk_delete'),
     path('journal-entries/<int:pk>/edit/', views.JournalEntryEditView.as_view(), name='journalentry_edit'),
     path('journal-entries/<int:pk>/delete/', views.JournalEntryDeleteView.as_view(), name='journalentry_delete'),
 

diff --git a/netbox/extras/views.py b/netbox/extras/views.py
@@ -320,6 +320,19 @@ def get_return_url(self, request, instance):
         return reverse(viewname, kwargs={'pk': obj.pk})
 
 
+class JournalEntryBulkEditView(generic.BulkEditView):
+    queryset = JournalEntry.objects.prefetch_related('created_by')
+    filterset = filters.JournalEntryFilterSet
+    table = tables.JournalEntryTable
+    form = forms.JournalEntryBulkEditForm
+
+
+class JournalEntryBulkDeleteView(generic.BulkDeleteView):
+    queryset = JournalEntry.objects.prefetch_related('created_by')
+    filterset = filters.JournalEntryFilterSet
+    table = tables.JournalEntryTable
+
+
 class ObjectJournalView(View):
     """
     Show all journal entries for an object.