From 3807dbf9344b39ffbe73b29fadecd91971a0c73e Mon Sep 17 00:00:00 2001 From: Valentin Deniaud Date: Thu, 28 Jan 2021 15:40:16 +0100 Subject: [PATCH 1/2] manager: do not mention desk in messages if it has no label (#50561) --- chrono/manager/views.py | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/chrono/manager/views.py b/chrono/manager/views.py index 24d3349..1bc0026 100644 --- a/chrono/manager/views.py +++ b/chrono/manager/views.py @@ -1761,16 +1761,22 @@ class UnavailabilityCalendarToggleView(ManagedDeskMixin, DetailView): try: self.desk.unavailability_calendars.get(pk=unavailability_calendar.pk) self.desk.unavailability_calendars.remove(unavailability_calendar) - message = _( - 'Unavailability calendar %(unavailability_calendar)s has been disabled on desk %(desk)s.' - ) + if self.desk.label: + message = _( + 'Unavailability calendar %(unavailability_calendar)s has been disabled on desk %(desk)s.' + ) + else: + message = _('Unavailability calendar %(unavailability_calendar)s has been disabled.') except UnavailabilityCalendar.DoesNotExist: activate = True self.desk.unavailability_calendars.add(unavailability_calendar) - message = _( - 'Unavailability calendar %(unavailability_calendar)s has been enabled on desk %(desk)s.' - ) + if self.desk.label: + message = _( + 'Unavailability calendar %(unavailability_calendar)s has been enabled on desk %(desk)s.' + ) + else: + message = _('Unavailability calendar %(unavailability_calendar)s has been enabled.') messages.info( self.request, message % {'unavailability_calendar': unavailability_calendar, 'desk': self.desk} ) @@ -2390,10 +2396,16 @@ class TimePeriodExceptionSourceToggleView(ManagedDeskSubobjectMixin, DetailView) source = self.get_object() if source.enabled: source.disable() - message = _('Exception source %(source)s has been disabled on desk %(desk)s.') + if source.desk.label: + message = _('Exception source %(source)s has been disabled on desk %(desk)s.') + else: + message = _('Exception source %(source)s has been disabled.') else: source.enable() - message = _('Exception source %(source)s has been enabled on desk %(desk)s.') + if source.desk.label: + message = _('Exception source %(source)s has been enabled on desk %(desk)s.') + else: + message = _('Exception source %(source)s has been enabled.') messages.info(self.request, message % {'source': source, 'desk': source.desk}) return HttpResponseRedirect( reverse('chrono-manager-agenda-settings', kwargs={'pk': source.desk.agenda_id}) -- 2.20.1