NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-09-06 14:23:36 -06:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

#20048 add get_action_url utility function

Browse Source
This commit is contained in:
Arthur 2025-08-07 13:55:26 -07:00
parent d7e92bdfb7
commit 976d20f48c
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
netbox/netbox/views/generic/bulk_views.py
View File

@ -12,7 +12,6 @@ from django.db.models.fields.reverse_related import ManyToManyRel
from django.forms import ModelMultipleChoiceField, MultipleHiddenInput from django.forms import ModelMultipleChoiceField, MultipleHiddenInput
from django.http import HttpResponse from django.http import HttpResponse
from django.shortcuts import get_object_or_404, redirect, render from django.shortcuts import get_object_or_404, redirect, render
from django.urls import reverse
from django.utils.safestring import mark_safe from django.utils.safestring import mark_safe
from django.utils.translation import gettext as _ from django.utils.translation import gettext as _
from mptt.models import MPTTModel from mptt.models import MPTTModel
@ -34,7 +33,7 @@ from utilities.permissions import get_permission_for_model
from utilities.query import reapply_model_ordering from utilities.query import reapply_model_ordering
from utilities.request import safe_for_redirect from utilities.request import safe_for_redirect
from utilities.tables import get_table_configs from utilities.tables import get_table_configs
from utilities.views import GetReturnURLMixin, get_viewname from utilities.views import GetReturnURLMixin, get_action_url
from .base import BaseMultiObjectView from .base import BaseMultiObjectView
from .mixins import ActionsMixin, TableMixin from .mixins import ActionsMixin, TableMixin
from .utils import get_prerequisite_model from .utils import get_prerequisite_model
@ -130,7 +129,7 @@ class ObjectListView(BaseMultiObjectView, ActionsMixin, TableMixin):
redirect_url = f'{request.path}?{query_params.urlencode()}' redirect_url = f'{request.path}?{query_params.urlencode()}'
if safe_for_redirect(redirect_url): if safe_for_redirect(redirect_url):
return redirect(redirect_url) return redirect(redirect_url)
return redirect(get_viewname(self.queryset.model, 'list')) return redirect(get_action_url(self.queryset.model, action='list'))
# #
# Request handlers # Request handlers
@ -513,7 +512,7 @@ class BulkImportView(GetReturnURLMixin, BaseMultiObjectView):
if form.is_valid(): if form.is_valid():
logger.debug("Import form validation was successful") logger.debug("Import form validation was successful")
redirect_url = reverse(get_viewname(model, action='list')) redirect_url = get_action_url(model, action='list')
# If indicated, defer this request to a background job & redirect the user # If indicated, defer this request to a background job & redirect the user
if form.cleaned_data['background_job']: if form.cleaned_data['background_job']: