diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2026-06-26 14:14:12 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2026-06-26 14:14:12 +0200 |
| commit | 18d95208a6cfe3cfe03edcc333deff3af14ee6fd (patch) | |
| tree | 8d461bf2227807da8be2bb45bbaddfb94e5f084d /archaeological_finds | |
| parent | 886425410c20585a6cbf2003b98b406812f2478f (diff) | |
| download | Ishtar-18d95208a6cfe3cfe03edcc333deff3af14ee6fd.tar.bz2 Ishtar-18d95208a6cfe3cfe03edcc333deff3af14ee6fd.zip | |
✨ JS - manage reload on modal close with tab activation for direct action url
Diffstat (limited to 'archaeological_finds')
| -rw-r--r-- | archaeological_finds/templates/ishtar/blocks/sheet_statement_condition.html | 2 | ||||
| -rw-r--r-- | archaeological_finds/views.py | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/archaeological_finds/templates/ishtar/blocks/sheet_statement_condition.html b/archaeological_finds/templates/ishtar/blocks/sheet_statement_condition.html index c546cf725..09cee8cd7 100644 --- a/archaeological_finds/templates/ishtar/blocks/sheet_statement_condition.html +++ b/archaeological_finds/templates/ishtar/blocks/sheet_statement_condition.html @@ -20,7 +20,7 @@ <i class="fa fa-plus"></i> doc./image </a> {% if not statement_condition.initial or statement_condition.no_associated_statement_condition %} - <a class="btn-qa-confirm btn btn-danger" href="#" data-confirm="{% trans 'Are you sure to delete this statement condition?' %}" data-target="{% url 'find-statement-condition-delete' statement_condition.pk %}" title="{% trans 'Delete' %}"> + <a class="btn-qa-confirm btn btn-danger" href="#" data-confirm="{% trans 'Are you sure to delete this statement condition?' %}" data-target="{% url 'find-statement-condition-delete' statement_condition.pk %}" title="{% trans 'Delete' %}" data-window="{{sheet_id}}" data-window-tab="warehouse-tab"> <i class="fa fa-trash" aria-hidden="true"></i> </a> {% endif %} diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py index b6ee6f37d..63301f778 100644 --- a/archaeological_finds/views.py +++ b/archaeological_finds/views.py @@ -1608,7 +1608,10 @@ def statement_condition_form(request, find_pk, statement_condition_pk=None, request.POST, current_item=item, user=request.user.ishtaruser) if form.is_valid(): form.save() - return HttpResponseRedirect(reverse("success")) + url = reverse("success") + message = str(_("Changes made successfully.")) + url += "?message=" + urllib.parse.quote(message) + return HttpResponseRedirect(url) else: form = forms_treatments.QAStatementCondition( current_item=item, user=request.user.ishtaruser, initial=initial) @@ -1623,7 +1626,9 @@ def statement_condition_form(request, find_pk, statement_condition_pk=None, url += "add" window_id = request.GET.get("window_id", "") window_tab = "warehouse-tab" - reload = "reload_window_" + window_id.replace("-", "_") + reload = "" + if window_id: + reload = "reload_window_" + window_id.replace("-", "_") window_id_root = "-".join(window_id.split("-")[:-1]) return render( request, |