Skip to content

Commit 05256c1

Browse files
committed
feat(views): Update prefetch fields for ACL rules
Replaces source_prefix and destination_prefix with generic source and destination prefetches in views for ACLStandardRule and ACLExtendedRule. Aligns view logic with the updated generic source/destination model for better flexibility and consistency.
1 parent 5d448d2 commit 05256c1

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

netbox_acls/views.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -323,8 +323,8 @@ class ACLStandardRuleView(generic.ObjectView):
323323

324324
queryset = models.ACLStandardRule.objects.prefetch_related(
325325
"access_list",
326+
"source",
326327
"tags",
327-
"source_prefix",
328328
)
329329

330330

@@ -336,8 +336,8 @@ class ACLStandardRuleListView(generic.ObjectListView):
336336

337337
queryset = models.ACLStandardRule.objects.prefetch_related(
338338
"access_list",
339+
"source",
339340
"tags",
340-
"source_prefix",
341341
)
342342
table = tables.ACLStandardRuleTable
343343
filterset = filtersets.ACLStandardRuleFilterSet
@@ -353,8 +353,8 @@ class ACLStandardRuleEditView(generic.ObjectEditView):
353353

354354
queryset = models.ACLStandardRule.objects.prefetch_related(
355355
"access_list",
356+
"source",
356357
"tags",
357-
"source_prefix",
358358
)
359359
form = forms.ACLStandardRuleForm
360360

@@ -376,17 +376,17 @@ class ACLStandardRuleDeleteView(generic.ObjectDeleteView):
376376

377377
queryset = models.ACLStandardRule.objects.prefetch_related(
378378
"access_list",
379+
"source",
379380
"tags",
380-
"source_prefix",
381381
)
382382

383383

384384
@register_model_view(models.ACLStandardRule, "bulk_delete", path="delete", detail=False)
385385
class ACLStandardRuleBulkDeleteView(generic.BulkDeleteView):
386386
queryset = models.ACLStandardRule.objects.prefetch_related(
387387
"access_list",
388+
"source",
388389
"tags",
389-
"source_prefix",
390390
)
391391
filterset = filtersets.ACLStandardRuleFilterSet
392392
table = tables.ACLStandardRuleTable
@@ -405,9 +405,9 @@ class ACLExtendedRuleView(generic.ObjectView):
405405

406406
queryset = models.ACLExtendedRule.objects.prefetch_related(
407407
"access_list",
408+
"source",
409+
"destination",
408410
"tags",
409-
"source_prefix",
410-
"destination_prefix",
411411
)
412412

413413

@@ -419,9 +419,9 @@ class ACLExtendedRuleListView(generic.ObjectListView):
419419

420420
queryset = models.ACLExtendedRule.objects.prefetch_related(
421421
"access_list",
422+
"source",
423+
"destination",
422424
"tags",
423-
"source_prefix",
424-
"destination_prefix",
425425
)
426426
table = tables.ACLExtendedRuleTable
427427
filterset = filtersets.ACLExtendedRuleFilterSet
@@ -437,9 +437,9 @@ class ACLExtendedRuleEditView(generic.ObjectEditView):
437437

438438
queryset = models.ACLExtendedRule.objects.prefetch_related(
439439
"access_list",
440+
"source",
441+
"destination",
440442
"tags",
441-
"source_prefix",
442-
"destination_prefix",
443443
)
444444
form = forms.ACLExtendedRuleForm
445445

@@ -461,19 +461,19 @@ class ACLExtendedRuleDeleteView(generic.ObjectDeleteView):
461461

462462
queryset = models.ACLExtendedRule.objects.prefetch_related(
463463
"access_list",
464+
"source",
465+
"destination",
464466
"tags",
465-
"source_prefix",
466-
"destination_prefix",
467467
)
468468

469469

470470
@register_model_view(models.ACLExtendedRule, "bulk_delete", path="delete", detail=False)
471471
class ACLExtendedRuleBulkDeleteView(generic.BulkDeleteView):
472472
queryset = models.ACLExtendedRule.objects.prefetch_related(
473473
"access_list",
474+
"source",
475+
"destination",
474476
"tags",
475-
"source_prefix",
476-
"destination_prefix",
477477
)
478478
filterset = filtersets.ACLExtendedRuleFilterSet
479479
table = tables.ACLExtendedRuleTable

0 commit comments

Comments
 (0)