From d38f62ed1b2792996576fb086cca017dda4671b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laur=C3=A9line=20Gu=C3=A9rin?= <zebuline@entrouvert.com>
Date: Fri, 31 Jan 2020 15:15:21 +0100
Subject: [PATCH] agenda: do not close the popup after an exception deletion
 (#37418)

---
 .../chrono/manager_meetings_agenda_settings.html    | 13 ++++++++++++-
 .../chrono/manager_time_period_exception_list.html  |  2 +-
 chrono/manager/views.py                             |  5 ++++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/chrono/manager/templates/chrono/manager_meetings_agenda_settings.html b/chrono/manager/templates/chrono/manager_meetings_agenda_settings.html
index a9fbf503..84cbf813 100644
--- a/chrono/manager/templates/chrono/manager_meetings_agenda_settings.html
+++ b/chrono/manager/templates/chrono/manager_meetings_agenda_settings.html
@@ -1,6 +1,17 @@
 {% extends "chrono/manager_agenda_settings.html" %}
 {% load i18n %}
 
+{% block extrascripts %}
+  {{ block.super }}
+  {% if 'display_exceptions' in request.GET %}
+  <script>
+    $(function () {
+      $('a.timeperiod-exception-all.desk-{{ request.GET.display_exceptions }}').click();
+    });
+  </script>
+  {% endif %}
+{% endblock %}
+
 {% block agenda-extra-management-actions %}
   <a rel="popup" href="{% url 'chrono-manager-agenda-add-meeting-type' pk=object.id %}">{% trans 'New Meeting Type' %}</a>
   <a rel="popup" href="{% url 'chrono-manager-agenda-add-desk' pk=object.id %}">{% trans 'New Desk' %}</a>
@@ -67,7 +78,7 @@
                         <a rel="popup" class="delete" href="{% url 'chrono-manager-time-period-exception-delete' pk=exception.id %}">{% trans "remove" %}</a>
                     {% endfor %}
                     {% if not desk.are_all_exceptions_displayed %}
-                    <li><a class="timeperiod-exception-all" rel="popup" data-selector="div.timeperiod" href="{% url 'chrono-manager-time-period-exception-extract-list' pk=desk.id %}">({% trans 'see all exceptions' %})</a></li>
+                    <li><a class="timeperiod-exception-all desk-{{ desk.pk }}" rel="popup" data-selector="div.timeperiod" href="{% url 'chrono-manager-time-period-exception-extract-list' pk=desk.id %}">({% trans 'see all exceptions' %})</a></li>
                     {% endif %}
                     <li><a class="add" rel="popup" href="{{add_time_period_exception_url}}">{% trans 'Add a time period exception' %}</a></li>
                 {% endif %}
diff --git a/chrono/manager/templates/chrono/manager_time_period_exception_list.html b/chrono/manager/templates/chrono/manager_time_period_exception_list.html
index 93954cfa..b267d90d 100644
--- a/chrono/manager/templates/chrono/manager_time_period_exception_list.html
+++ b/chrono/manager/templates/chrono/manager_time_period_exception_list.html
@@ -21,7 +21,7 @@
     {% for exception in object_list %}
      <li>
          <a {% if user_can_manage %}href="{% url 'chrono-manager-time-period-exception-edit' pk=exception.id %}"{% endif %}>{{ exception }}</a>
-        {% if user_can_manage %}<a rel="popup" class="delete" href="{% url 'chrono-manager-time-period-exception-delete' pk=exception.id %}">{% trans "remove" %}</a>{% endif %}
+         {% if user_can_manage %}<a rel="popup" class="delete" href="{% url 'chrono-manager-time-period-exception-delete' pk=exception.id %}{% if not page_obj %}?from_popup{% endif %}">{% trans "remove" %}</a>{% endif %}
     </li>
     {% endfor %}
    </ul>
diff --git a/chrono/manager/views.py b/chrono/manager/views.py
index 91a574d9..4580c8cd 100644
--- a/chrono/manager/views.py
+++ b/chrono/manager/views.py
@@ -926,7 +926,10 @@ class TimePeriodExceptionDeleteView(ManagedDeskSubobjectMixin, DeleteView):
         if success_url in referer:
             return success_url
 
-        return super(TimePeriodExceptionDeleteView, self).get_success_url()
+        success_url = super(TimePeriodExceptionDeleteView, self).get_success_url()
+        if 'from_popup' in self.request.GET:
+            success_url = '{}?display_exceptions={}'.format(success_url, self.desk.pk)
+        return success_url
 
 
 time_period_exception_delete = TimePeriodExceptionDeleteView.as_view()