From 30cb3f672ff76a37cae3f07fce765cfe3ea804bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Fri, 13 Dec 2019 16:09:59 +0100
Subject: [PATCH] manager: use dedicated template for exception deletion
 confirm page (#38511)

---
 .../chrono/manager_confirm_delete.html        |  4 ++--
 .../manager_confirm_exception_delete.html     | 19 +++++++++++++++++++
 chrono/manager/views.py                       |  2 +-
 tests/test_manager.py                         | 10 +++++-----
 4 files changed, 27 insertions(+), 8 deletions(-)
 create mode 100644 chrono/manager/templates/chrono/manager_confirm_exception_delete.html

diff --git a/chrono/manager/templates/chrono/manager_confirm_delete.html b/chrono/manager/templates/chrono/manager_confirm_delete.html
index 469da722..e17c829f 100644
--- a/chrono/manager/templates/chrono/manager_confirm_delete.html
+++ b/chrono/manager/templates/chrono/manager_confirm_delete.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 
 {% block appbar %}
-<h2>{{ object }}</h2>
+<h2>{{ view.model.get_verbose_name }}</h2>
 {% endblock %}
 
 {% block content %}
@@ -13,7 +13,7 @@
   {% blocktrans %}This cannot be removed as there are bookings for a future date.
   {% endblocktrans %}
   {% else %}
-  {% blocktrans %}Are you sure you want to delete this exception?{% endblocktrans %}
+  {% blocktrans %}Are you sure you want to delete this?{% endblocktrans %}
   {% endif %}
   </p>
   <div class="buttons">
diff --git a/chrono/manager/templates/chrono/manager_confirm_exception_delete.html b/chrono/manager/templates/chrono/manager_confirm_exception_delete.html
new file mode 100644
index 00000000..0d567484
--- /dev/null
+++ b/chrono/manager/templates/chrono/manager_confirm_exception_delete.html
@@ -0,0 +1,19 @@
+{% extends "chrono/manager_home.html" %}
+{% load i18n %}
+
+{% block appbar %}
+<h2>{{ object }}</h2>
+{% endblock %}
+
+{% block content %}
+<form method="post">
+  {% csrf_token %}
+  <p>
+  {% blocktrans %}Are you sure you want to delete this exception?{% endblocktrans %}
+  </p>
+  <div class="buttons">
+    <button class="delete-button" {% if cannot_delete %}disabled="disabled"{% endif %}>{% trans 'Delete' %}</button>
+    <a class="cancel" href="{{ object.get_absolute_url }}">{% trans 'Cancel' %}</a>
+  </div>
+</form>
+{% endblock %}
diff --git a/chrono/manager/views.py b/chrono/manager/views.py
index 336f57da..33a0be95 100644
--- a/chrono/manager/views.py
+++ b/chrono/manager/views.py
@@ -782,7 +782,7 @@ time_period_exception_extract_list = TimePeriodExceptionExtractListView.as_view(
 
 
 class TimePeriodExceptionDeleteView(ManagedDeskSubobjectMixin, DeleteView):
-    template_name = 'chrono/manager_confirm_delete.html'
+    template_name = 'chrono/manager_confirm_exception_delete.html'
     model = TimePeriodException
 
     def get_success_url(self):
diff --git a/tests/test_manager.py b/tests/test_manager.py
index dc4db09f..8913345c 100644
--- a/tests/test_manager.py
+++ b/tests/test_manager.py
@@ -250,7 +250,7 @@ def test_delete_busy_agenda(app, admin_user):
     resp = app.get('/manage/', status=200)
     resp = resp.click('Foo bar').follow()
     resp = resp.click('Delete')
-    assert 'Are you sure you want to delete this exception?' in resp.text
+    assert 'Are you sure you want to delete this?' in resp.text
 
     booking = Booking(event=event)
     booking.save()
@@ -264,7 +264,7 @@ def test_delete_busy_agenda(app, admin_user):
     resp = app.get('/manage/', status=200)
     resp = resp.click('Foo bar').follow()
     resp = resp.click('Delete')
-    assert 'Are you sure you want to delete this exception?' in resp.text
+    assert 'Are you sure you want to delete this?' in resp.text
 
     # suddenly the booking is no longer cancelled, but the admin clicks on the
     # delete button.
@@ -300,7 +300,7 @@ def test_delete_busy_desk(app, admin_user):
     resp = resp.click('Settings')
     desk_page = resp.click('Desk A')
     desk_delete_page = desk_page.click('Delete')
-    assert 'Are you sure you want to delete this exception?' in desk_delete_page.text
+    assert 'Are you sure you want to delete this?' in desk_delete_page.text
     # make sure the deleting is not disabled
     assert 'disabled' not in desk_delete_page.text
 
@@ -489,7 +489,7 @@ def test_delete_busy_event(app, admin_user):
     resp = app.get('/manage/agendas/%s/settings' % agenda.id, status=200)
     resp = resp.click(href=r'/manage/events/%s/$' % event.id)
     resp = resp.click('Delete')
-    assert 'Are you sure you want to delete this exception?' in resp.text
+    assert 'Are you sure you want to delete this?' in resp.text
 
     booking = Booking(event=event)
     booking.save()
@@ -503,7 +503,7 @@ def test_delete_busy_event(app, admin_user):
     resp = app.get('/manage/agendas/%s/settings' % agenda.id, status=200)
     resp = resp.click(href=r'/manage/events/%s/$' % event.id)
     resp = resp.click('Delete')
-    assert 'Are you sure you want to delete this exception?' in resp.text
+    assert 'Are you sure you want to delete this?' in resp.text
 
     # suddenly the booking is no longer cancelled, but the admin clicks on the
     # delete button.