From 05c08d9098ddc2d0565b10d55f21d8c1f727662a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laur=C3=A9line=20Gu=C3=A9rin?= <zebuline@entrouvert.com>
Date: Thu, 1 Jun 2023 11:36:44 +0200
Subject: [PATCH] invoicing: reorganize regie templates (#78125)

---
 .../lingo/invoicing/manager_regie_common.html        | 12 ------------
 .../lingo/invoicing/manager_regie_detail.html        |  4 ++--
 .../lingo/invoicing/manager_regie_form.html          | 10 +++++++---
 .../lingo/invoicing/manager_regie_list.html          |  7 ++++++-
 4 files changed, 15 insertions(+), 18 deletions(-)
 delete mode 100644 lingo/invoicing/templates/lingo/invoicing/manager_regie_common.html

diff --git a/lingo/invoicing/templates/lingo/invoicing/manager_regie_common.html b/lingo/invoicing/templates/lingo/invoicing/manager_regie_common.html
deleted file mode 100644
index 44b7c09..0000000
--- a/lingo/invoicing/templates/lingo/invoicing/manager_regie_common.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{% extends "lingo/invoicing/manager_home.html" %}
-{% load i18n %}
-
-{% block appbar %}
-  <h2>{% if regie %}{% trans 'Regie' %} - {{regie}} {% else %}{% trans 'Regies' %}{% endif %}</h2>
-{% endblock %}
-
-
-{% block breadcrumb %}
-  {{ block.super }}
-  <a href="{% url 'lingo-manager-invoicing-regie-list' %}">{% trans "Regies" %}</a>
-{% endblock %}
diff --git a/lingo/invoicing/templates/lingo/invoicing/manager_regie_detail.html b/lingo/invoicing/templates/lingo/invoicing/manager_regie_detail.html
index b9a0e1e..cb1dffc 100644
--- a/lingo/invoicing/templates/lingo/invoicing/manager_regie_detail.html
+++ b/lingo/invoicing/templates/lingo/invoicing/manager_regie_detail.html
@@ -1,4 +1,4 @@
-{% extends "lingo/invoicing/manager_regie_common.html" %}
+{% extends "lingo/invoicing/manager_regie_list.html" %}
 {% load i18n gadjo %}
 
 {% block breadcrumb %}
@@ -7,7 +7,7 @@
 {% endblock %}
 
 {% block appbar %}
-  {{ block.super }}
+  <h2>{% trans 'Regie' %} - {{ regie }}</h2>
   <span class="actions">
     {% if not has_related_objects %}
       <a href="{% url 'lingo-manager-invoicing-regie-delete' pk=regie.pk %}" rel="popup">{% trans "Delete" %}</a>
diff --git a/lingo/invoicing/templates/lingo/invoicing/manager_regie_form.html b/lingo/invoicing/templates/lingo/invoicing/manager_regie_form.html
index 574e1eb..51c6612 100644
--- a/lingo/invoicing/templates/lingo/invoicing/manager_regie_form.html
+++ b/lingo/invoicing/templates/lingo/invoicing/manager_regie_form.html
@@ -1,4 +1,4 @@
-{% extends "lingo/invoicing/manager_regie_common.html" %}
+{% extends "lingo/invoicing/manager_regie_list.html" %}
 {% load i18n gadjo %}
 
 {% block breadcrumb %}
@@ -13,7 +13,7 @@
 
 {% block appbar %}
   {% if regie.pk %}
-    <h2>{% trans "Edit regie" %} - {{regie}}</h2>
+    <h2>{% trans "Edit regie" %} - {{ regie }}</h2>
   {% else %}
     <h2>{% trans "New regie" %}</h2>
   {% endif %}
@@ -25,7 +25,11 @@
     {{ form|with_template }}
     <div class="buttons">
       <button>{% trans "Submit" %}</button>
-      <a class="cancel" href="{{cancel_url}}">{% trans 'Cancel' %}</a>
+      {% if object.pk %}
+        <a class="cancel" href="{% url 'lingo-manager-invoicing-regie-detail' regie.pk %}">{% trans 'Cancel' %}</a>
+      {% else %}
+        <a class="cancel" href="{% url 'lingo-manager-invoicing-regie-list' %}">{% trans 'Cancel' %}</a>
+      {% endif %}
     </div>
   </form>
 {% endblock %}
diff --git a/lingo/invoicing/templates/lingo/invoicing/manager_regie_list.html b/lingo/invoicing/templates/lingo/invoicing/manager_regie_list.html
index 26d6f0c..24ee278 100644
--- a/lingo/invoicing/templates/lingo/invoicing/manager_regie_list.html
+++ b/lingo/invoicing/templates/lingo/invoicing/manager_regie_list.html
@@ -1,6 +1,11 @@
-{% extends "lingo/invoicing/manager_regie_common.html" %}
+{% extends "lingo/invoicing/manager_home.html" %}
 {% load i18n %}
 
+{% block breadcrumb %}
+  {{ block.super }}
+  <a href="{% url 'lingo-manager-invoicing-regie-list' %}">{% trans "Regies" %}</a>
+{% endblock %}
+
 {% block appbar %}
   <h2>{% trans 'Regies' %}</h2>
   <span class="actions">