NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-26 09:16:10 -06:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

fixes return_url for image attachment #12538

Browse Source
This commit is contained in:
Abhimanyu Saharan 2023-05-26 00:36:19 +05:30
parent bf1c191b2e
commit 2bc8a97d80
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
netbox/netbox/tables/columns.py
View File

@ -235,7 +235,12 @@ class ActionsColumn(tables.Column):
model = table.Meta.model model = table.Meta.model
request = getattr(table, 'context', {}).get('request') request = getattr(table, 'context', {}).get('request')
url_appendix = f'?return_url={quote(request.get_full_path())}' if request else '' query_params = request.GET.copy() if request else {}
if return_url := query_params.pop('return_url', None):
url_appendix = f'?return_url={quote(return_url[0])}'
else:
url_appendix = f'?return_url={quote(request.get_full_path())}' if request else ''
html = '' html = ''
# Compile actions menu # Compile actions menu

2
netbox/templates/inc/panels/image_attachments.html
View File

@ -5,7 +5,7 @@
Images Images
</h5> </h5>
<div class="card-body htmx-container table-responsive" <div class="card-body htmx-container table-responsive"
hx-get="{% url 'extras:imageattachment_list' %}?content_type_id={{ object|content_type_id }}&object_id={{ object.pk }}" hx-get="{% url 'extras:imageattachment_list' %}?content_type_id={{ object|content_type_id }}&object_id={{ object.pk }}&return_url={{ request.path }}"
hx-trigger="load"></div> hx-trigger="load"></div>
{% if perms.extras.add_imageattachment %} {% if perms.extras.add_imageattachment %}
<div class="card-footer text-end noprint"> <div class="card-footer text-end noprint">