From bb04eed6826f0f3cbe44fc56818fa31148c90f13 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 7 Jul 2022 11:31:19 +0200 Subject: Preventive file form: improve price agreement form (+ edit button, redirect) --- .../templates/ishtar/forms/preventive_detail.html | 10 ++++++++++ .../templates/ishtar/forms/preventive_price_agreement.html | 10 ++++++++++ archaeological_files/views.py | 6 +++++- 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 archaeological_files/templates/ishtar/forms/preventive_price_agreement.html diff --git a/archaeological_files/templates/ishtar/forms/preventive_detail.html b/archaeological_files/templates/ishtar/forms/preventive_detail.html index 9ad5c4802..59ebb8278 100644 --- a/archaeological_files/templates/ishtar/forms/preventive_detail.html +++ b/archaeological_files/templates/ishtar/forms/preventive_detail.html @@ -1,6 +1,16 @@ {% extends "ishtar/forms/base_form.html" %} {% load i18n table_form %} +{% block form_head %} +
+ + + {% trans "Change price agreement" %} + +
+ +{% endblock %} + {% block bs_form_inlines %}
diff --git a/archaeological_files/templates/ishtar/forms/preventive_price_agreement.html b/archaeological_files/templates/ishtar/forms/preventive_price_agreement.html new file mode 100644 index 000000000..d5d8a9319 --- /dev/null +++ b/archaeological_files/templates/ishtar/forms/preventive_price_agreement.html @@ -0,0 +1,10 @@ +{% extends "ishtar/forms/base_form.html" %} +{% load i18n %} + +{% block extra_validation_button %} + +{% endblock %} diff --git a/archaeological_files/views.py b/archaeological_files/views.py index 3e8d37809..d91688ac4 100644 --- a/archaeological_files/views.py +++ b/archaeological_files/views.py @@ -410,7 +410,7 @@ class PreventiveSimpleEditView(IshtarMixin, LoginRequiredMixin, UpdateView): page_name = _("Intervention plan") form_class = forms.PreventiveFileSimpleForm - template_name = "ishtar/forms/base_form.html" + template_name = "ishtar/forms/preventive_price_agreement.html" model = models.File def get_context_data(self, **kwargs): @@ -436,6 +436,10 @@ class PreventiveSimpleEditView(IshtarMixin, LoginRequiredMixin, item.delete() return super().form_valid(form) + def get_success_url(self): + url = reverse("file-edit-preventive", args=[self.object.pk]) + return url + class PreventiveEditView(IshtarMixin, LoginRequiredMixin, MixFormFormsetUpdateView): page_name = _("Intervention plan") -- cgit v1.2.3