Projet

Général

Profil

0001-manager-do-not-mention-desk-in-messages-if-it-has-no.patch

Valentin Deniaud, 27 avril 2021 18:01

Télécharger (3,63 ko)

Voir les différences:

Subject: [PATCH 1/4] manager: do not mention desk in messages if it has no
 label (#50561)

 chrono/manager/views.py | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)
chrono/manager/views.py
2007 2007
        try:
2008 2008
            self.desk.unavailability_calendars.get(pk=unavailability_calendar.pk)
2009 2009
            self.desk.unavailability_calendars.remove(unavailability_calendar)
2010
            message = _(
2011
                'Unavailability calendar %(unavailability_calendar)s has been disabled on desk %(desk)s.'
2012
            )
2010
            if self.desk.label and not self.desk.agenda.desk_simple_management:
2011
                message = _(
2012
                    'Unavailability calendar %(unavailability_calendar)s has been disabled on desk %(desk)s.'
2013
                )
2014
            else:
2015
                message = _('Unavailability calendar %(unavailability_calendar)s has been disabled.')
2013 2016
        except UnavailabilityCalendar.DoesNotExist:
2014 2017
            enabled = True
2015 2018
            self.desk.unavailability_calendars.add(unavailability_calendar)
2016
            message = _(
2017
                'Unavailability calendar %(unavailability_calendar)s has been enabled on desk %(desk)s.'
2018
            )
2019
            if self.desk.label and not self.desk.agenda.desk_simple_management:
2020
                message = _(
2021
                    'Unavailability calendar %(unavailability_calendar)s has been enabled on desk %(desk)s.'
2022
                )
2023
            else:
2024
                message = _('Unavailability calendar %(unavailability_calendar)s has been enabled.')
2019 2025

  
2020 2026
        if self.desk.agenda.desk_simple_management:
2021 2027
            for desk in self.desk.agenda.desk_set.exclude(pk=self.desk.pk):
2022 2028
                if enabled:
2023 2029
                    desk.unavailability_calendars.add(unavailability_calendar)
2024
                    message = _('Unavailability calendar %(unavailability_calendar)s has been enabled.')
2025 2030
                else:
2026 2031
                    desk.unavailability_calendars.remove(unavailability_calendar)
2027
                    message = _('Unavailability calendar %(unavailability_calendar)s has been disabled.')
2028 2032

  
2029 2033
        messages.info(
2030 2034
            self.request, message % {'unavailability_calendar': unavailability_calendar, 'desk': self.desk}
......
2797 2801
        if source.enabled:
2798 2802
            source.disable()
2799 2803
            was_enabled = False
2800
            message = _('Exception source %(source)s has been disabled on desk %(desk)s.')
2804
            if source.desk.label:
2805
                message = _('Exception source %(source)s has been disabled on desk %(desk)s.')
2806
            else:
2807
                message = _('Exception source %(source)s has been disabled.')
2801 2808
        else:
2802 2809
            source.enable()
2803 2810
            was_enabled = True
2804
            message = _('Exception source %(source)s has been enabled on desk %(desk)s.')
2811
            if source.desk.label:
2812
                message = _('Exception source %(source)s has been enabled on desk %(desk)s.')
2813
            else:
2814
                message = _('Exception source %(source)s has been enabled.')
2805 2815

  
2806 2816
        if self.desk.agenda.desk_simple_management:
2807 2817
            for desk in self.desk.agenda.desk_set.exclude(pk=self.desk.pk):
2808
-