NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-01-21 19:18:44 -06:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

20048 cleanup get_viewname URL resolution (#20050)
Some checks are pending
CI / build (20.x, 3.10) (push) Waiting to run
Details
CI / build (20.x, 3.11) (push) Waiting to run
Details
CI / build (20.x, 3.12) (push) Waiting to run
Details

Browse Source 
* #20048 add get_action_url utility function

* #20048 add get_action_url utility function

* #20048 add get_action_url utility function

* #20048 add get_action_url utility function

* #20048 add get_action_url utility function

* #20048 action_url template tag

* #20048 action_url template tag

* #20048 fix test

* #20048 review feedback

* #20048 fix tags
This commit is contained in:
Arthur Hanson
2025-08-11 05:38:19 -07:00
committed by GitHub
parent 1242ad68f7
commit a585bc044e
24 changed files with 220 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
netbox/extras/views.py
View File

@@ -31,7 +31,7 @@ from utilities.querydict import normalize_querydict
from utilities.request import copy_safe_request
from utilities.rqworker import get_workers_for_queue
from utilities.templatetags.builtins.filters import render_markdown
from utilities.views import ContentTypePermissionRequiredMixin, get_viewname, register_model_view
from utilities.views import ContentTypePermissionRequiredMixin, get_action_url, register_model_view
from virtualization.models import VirtualMachine
from . import filtersets, forms, tables
from .constants import LOG_LEVEL_RANK
@@ -1103,8 +1103,7 @@ class JournalEntryEditView(generic.ObjectEditView):
if not instance.assigned_object:
return reverse('extras:journalentry_list')
obj = instance.assigned_object
viewname = get_viewname(obj, 'journal')
return reverse(viewname, kwargs={'pk': obj.pk})
return get_action_url(obj, action='journal', kwargs={'pk': obj.pk})
@register_model_view(JournalEntry, 'delete')
@@ -1113,8 +1112,7 @@ class JournalEntryDeleteView(generic.ObjectDeleteView):
def get_return_url(self, request, instance):
obj = instance.assigned_object
viewname = get_viewname(obj, 'journal')
return reverse(viewname, kwargs={'pk': obj.pk})
return get_action_url(obj, action='journal', kwargs={'pk': obj.pk})
@register_model_view(JournalEntry, 'bulk_import', path='import', detail=False)