diff --git a/chrono/manager/views.py b/chrono/manager/views.py index f7e39fa1..40ad81ed 100644 --- a/chrono/manager/views.py +++ b/chrono/manager/views.py @@ -2007,24 +2007,28 @@ 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 and not self.desk.agenda.desk_simple_management: + 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: enabled = 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 and not self.desk.agenda.desk_simple_management: + message = _( + 'Unavailability calendar %(unavailability_calendar)s has been enabled on desk %(desk)s.' + ) + else: + message = _('Unavailability calendar %(unavailability_calendar)s has been enabled.') if self.desk.agenda.desk_simple_management: for desk in self.desk.agenda.desk_set.exclude(pk=self.desk.pk): if enabled: desk.unavailability_calendars.add(unavailability_calendar) - message = _('Unavailability calendar %(unavailability_calendar)s has been enabled.') else: desk.unavailability_calendars.remove(unavailability_calendar) - message = _('Unavailability calendar %(unavailability_calendar)s has been disabled.') messages.info( self.request, message % {'unavailability_calendar': unavailability_calendar, 'desk': self.desk} @@ -2797,11 +2801,17 @@ class TimePeriodExceptionSourceToggleView(ManagedDeskSubobjectMixin, DetailView) if source.enabled: source.disable() was_enabled = False - 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() was_enabled = True - 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.') if self.desk.agenda.desk_simple_management: for desk in self.desk.agenda.desk_set.exclude(pk=self.desk.pk):