diff options
| -rw-r--r-- | archaeological_context_records/forms.py | 2 | ||||
| -rw-r--r-- | archaeological_context_records/views.py | 12 | ||||
| -rw-r--r-- | archaeological_finds/views.py | 5 | ||||
| -rw-r--r-- | archaeological_operations/views.py | 5 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/forms/success.html | 5 | ||||
| -rw-r--r-- | ishtar_common/views.py | 3 |
6 files changed, 23 insertions, 9 deletions
diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py index 11d4cbbb1..18d0079e0 100644 --- a/archaeological_context_records/forms.py +++ b/archaeological_context_records/forms.py @@ -693,7 +693,7 @@ class QAOperationCR(IshtarForm): data["parcel_id"] = self.cleaned_data["parcel"] else: data["town_id"] = self.cleaned_data["town"] - models.ContextRecord.objects.create(**data) + return models.ContextRecord.objects.create(**data) class QAContextRecordDuplicateForm(IshtarForm): diff --git a/archaeological_context_records/views.py b/archaeological_context_records/views.py index 81c99f494..26edc107b 100644 --- a/archaeological_context_records/views.py +++ b/archaeological_context_records/views.py @@ -247,6 +247,8 @@ class QAOperationContextRecordView(QAItemForm): model = Operation form_class = forms.QAOperationCR page_name = _("Context record") + icon = "fa fa-plus" + action_name = _("Create") def get_quick_action(self): return QuickAction( @@ -258,8 +260,9 @@ class QAOperationContextRecordView(QAItemForm): ) def form_valid(self, form): - form.save(self.items) - return HttpResponseRedirect(reverse("success")) + cr = form.save(self.items) + url = reverse(models.ContextRecord.SHOW_URL, kwargs={"pk": cr.pk}) + return HttpResponseRedirect(reverse("success") + f"?load_window={url}") class QAContextRecordLockView(QABaseLockView): @@ -280,8 +283,9 @@ class QAContextRecordDuplicateFormView(QAItemForm): return kwargs def form_valid(self, form): - form.save() - return HttpResponseRedirect(reverse("success")) + cr = form.save() + url = reverse(models.ContextRecord.SHOW_URL, kwargs={"pk": cr.pk}) + return HttpResponseRedirect(reverse("success") + f"?load_window={url}") def get_context_data(self, **kwargs): data = super(QAContextRecordDuplicateFormView, self).get_context_data(**kwargs) diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py index d8b5a3c64..118283d18 100644 --- a/archaeological_finds/views.py +++ b/archaeological_finds/views.py @@ -1355,8 +1355,9 @@ class QAFindDuplicateFormView(QAItemForm): return kwargs def form_valid(self, form): - form.save() - return HttpResponseRedirect(reverse("success")) + find = form.save() + url = reverse(models.Find.SHOW_URL, kwargs={"pk": find.pk}) + return HttpResponseRedirect(reverse("success") + f"?load_window={url}") def get_context_data(self, **kwargs): data = super(QAFindDuplicateFormView, self).get_context_data(**kwargs) diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py index 385061c0a..00049a870 100644 --- a/archaeological_operations/views.py +++ b/archaeological_operations/views.py @@ -1030,8 +1030,9 @@ class QAOperationdDuplicateFormView(QAItemForm): return kwargs def form_valid(self, form): - form.save() - return HttpResponseRedirect(reverse("success")) + operation = form.save() + url = reverse(models.Operation.SHOW_URL, kwargs={"pk": operation.pk}) + return HttpResponseRedirect(reverse("success") + f"?load_window={url}") def get_context_data(self, **kwargs): data = super(QAOperationdDuplicateFormView, self).get_context_data(**kwargs) diff --git a/ishtar_common/templates/ishtar/forms/success.html b/ishtar_common/templates/ishtar/forms/success.html index 963273276..a3885a813 100644 --- a/ishtar_common/templates/ishtar/forms/success.html +++ b/ishtar_common/templates/ishtar/forms/success.html @@ -12,6 +12,11 @@ $(document).ready(function(){ window.location.replace(redirect); }, 500); {% endif %} + {% if load_window %} + setTimeout(function(){ + load_window("{{load_window}}"); + }, 1000); + {% endif %} main_submit_search(); }); diff --git a/ishtar_common/views.py b/ishtar_common/views.py index 877bd8ae7..a7784feac 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -3110,6 +3110,9 @@ class SuccessView(TemplateView): msg = self.request.GET.get("message") if msg: data["message"] = urllib.parse.unquote(msg) + load = self.request.GET.get("load_window") + if load: + data["load_window"] = urllib.parse.unquote(load) return data |