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 %}
+
+ {% endif %}
+{% endblock %}
+
{% block agenda-extra-management-actions %}
{% trans 'New Meeting Type' %}
{% trans 'New Desk' %}
@@ -67,7 +78,7 @@
{% trans "remove" %}
{% endfor %}
{% if not desk.are_all_exceptions_displayed %}
-
({% trans 'see all exceptions' %})
+ ({% trans 'see all exceptions' %})
{% endif %}
{% trans 'Add a time period exception' %}
{% 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 %}
{{ exception }}
- {% if user_can_manage %}{% trans "remove" %}{% endif %}
+ {% if user_can_manage %}{% trans "remove" %}{% endif %}
{% endfor %}
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()