Projet

Général

Profil

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

Valentin Deniaud, 22 février 2021 15:25

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
1784 1784 
        try:
1785 1785 
            self.desk.unavailability_calendars.get(pk=unavailability_calendar.pk)
1786 1786 
            self.desk.unavailability_calendars.remove(unavailability_calendar)
1787 
            message = _(
1788 
                'Unavailability calendar %(unavailability_calendar)s has been disabled on desk %(desk)s.'
1789 
            )
1787 
            if self.desk.label and not self.desk.agenda.desk_simple_management:
1788 
                message = _(
1789 
                    'Unavailability calendar %(unavailability_calendar)s has been disabled on desk %(desk)s.'
1790 
                )
1791 
            else:
1792 
                message = _('Unavailability calendar %(unavailability_calendar)s has been disabled.')
1790 1793 
        except UnavailabilityCalendar.DoesNotExist:
1791 1794 
            enabled = True
1792 1795 
            self.desk.unavailability_calendars.add(unavailability_calendar)
1793 
            message = _(
1794 
                'Unavailability calendar %(unavailability_calendar)s has been enabled on desk %(desk)s.'
1795 
            )
1796 
            if self.desk.label and not self.desk.agenda.desk_simple_management:
1797 
                message = _(
1798 
                    'Unavailability calendar %(unavailability_calendar)s has been enabled on desk %(desk)s.'
1799 
                )
1800 
            else:
1801 
                message = _('Unavailability calendar %(unavailability_calendar)s has been enabled.')
1796 1802 

  		




  1797
  1803
  
    
        if self.desk.agenda.desk_simple_management:

  		




  1798
  1804
  
    
            for desk in self.desk.agenda.desk_set.exclude(pk=self.desk.pk):

  		




  1799
  1805
  
    
                if enabled:

  		




  1800
  1806
  
    
                    desk.unavailability_calendars.add(unavailability_calendar)

  		




  1801
  
  
    
                    message = _('Unavailability calendar %(unavailability_calendar)s has been enabled.')

  		




  1802
  1807
  
    
                else:

  		




  1803
  1808
  
    
                    desk.unavailability_calendars.remove(unavailability_calendar)

  		




  1804
  
  
    
                    message = _('Unavailability calendar %(unavailability_calendar)s has been disabled.')

  		




  1805
  1809
  
    

  		




  1806
  1810
  
    
        messages.info(

  		




  1807
  1811
  
    
            self.request, message % {'unavailability_calendar': unavailability_calendar, 'desk': self.desk}

  		




  ......




  2509
  2513
  
    
        if source.enabled:

  		




  2510
  2514
  
    
            source.disable()

  		




  2511
  2515
  
    
            was_enabled = False

  		




  2512
  
  
    
            message = _('Exception source %(source)s has been disabled on desk %(desk)s.')

  		




  
  2516
  
    
            if source.desk.label:

  		




  
  2517
  
    
                message = _('Exception source %(source)s has been disabled on desk %(desk)s.')

  		




  
  2518
  
    
            else:

  		




  
  2519
  
    
                message = _('Exception source %(source)s has been disabled.')

  		




  2513
  2520
  
    
        else:

  		




  2514
  2521
  
    
            source.enable()

  		




  2515
  2522
  
    
            was_enabled = True

  		




  2516
  
  
    
            message = _('Exception source %(source)s has been enabled on desk %(desk)s.')

  		




  
  2523
  
    
            if source.desk.label:

  		




  
  2524
  
    
                message = _('Exception source %(source)s has been enabled on desk %(desk)s.')

  		




  
  2525
  
    
            else:

  		




  
  2526
  
    
                message = _('Exception source %(source)s has been enabled.')

  		




  2517
  2527
  
    

  		




  2518
  2528
  
    
        if self.desk.agenda.desk_simple_management:

  		




  2519
  2529
  
    
            for desk in self.desk.agenda.desk_set.exclude(pk=self.desk.pk):

  		




  2520
  
  
    
-