diff options
| -rw-r--r-- | archaeological_finds/views.py | 7 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/blocks/window_nav.html | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py index 63301f778..11189cfc1 100644 --- a/archaeological_finds/views.py +++ b/archaeological_finds/views.py @@ -1600,8 +1600,11 @@ def statement_condition_form(request, find_pk, statement_condition_pk=None, q = models.StatementCondition.objects.filter(find_id=find_pk, applied="D") if q.exists(): sc_pk = q.values_list("pk", flat=True)[0] - return HttpResponseRedirect( - reverse("find-statement-condition-modify", args=[find_pk, sc_pk])) + url = reverse("find-statement-condition-modify", args=[find_pk, sc_pk]) + window_id = request.GET.get("window_id", "") + if window_id: + url += "?window_id={window_id}" + return HttpResponseRedirect(url) initial = models.StatementCondition.get_initial_from_find(item) if request.method == 'POST': form = forms_treatments.QAStatementCondition( diff --git a/ishtar_common/templates/ishtar/blocks/window_nav.html b/ishtar_common/templates/ishtar/blocks/window_nav.html index c389147e4..282d0fc22 100644 --- a/ishtar_common/templates/ishtar/blocks/window_nav.html +++ b/ishtar_common/templates/ishtar/blocks/window_nav.html @@ -76,7 +76,7 @@ {% endif %} {% for url, base_text, icon, extra_text, css_class, is_qa in extra_actions %} <a class="{% if is_qa %}btn-qa{% else %}wait-button{% endif %} btn btn-success{% if css_class %} {{css_class}}{% endif %}" - {% if is_qa %}href="#" data-target="{{url}}"{% else %}href='{{url}}'{% endif %} title="{{base_text}}"> + {% if is_qa %}href="#" data-target="{{url}}" data-window="{{window_id}}"{% else %}href='{{url}}'{% endif %} title="{{base_text}}"> <i class="{{icon}}"></i> {{extra_text}} </a> {% endfor %} |