Projet

Général

Profil

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

Valentin Deniaud, 28 janvier 2021 17:21

Télécharger (3,06 ko)

Voir les différences: 

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(-)
chrono/manager/views.py
1761 1761 
        try:
1762 1762 
            self.desk.unavailability_calendars.get(pk=unavailability_calendar.pk)
1763 1763 
            self.desk.unavailability_calendars.remove(unavailability_calendar)
1764 
            message = _(
1765 
                'Unavailability calendar %(unavailability_calendar)s has been disabled on desk %(desk)s.'
1766 
            )
1764 
            if self.desk.label:
1765 
                message = _(
1766 
                    'Unavailability calendar %(unavailability_calendar)s has been disabled on desk %(desk)s.'
1767 
                )
1768 
            else:
1769 
                message = _('Unavailability calendar %(unavailability_calendar)s has been disabled.')
1767 1770 

  		




  1768
  1771
  
    
        except UnavailabilityCalendar.DoesNotExist:

  		




  1769
  1772
  
    
            activate = True

  		




  1770
  1773
  
    
            self.desk.unavailability_calendars.add(unavailability_calendar)

  		




  1771
  
  
    
            message = _(

  		




  1772
  
  
    
                'Unavailability calendar %(unavailability_calendar)s has been enabled on desk %(desk)s.'

  		




  1773
  
  
    
            )

  		




  
  1774
  
    
            if self.desk.label:

  		




  
  1775
  
    
                message = _(

  		




  
  1776
  
    
                    'Unavailability calendar %(unavailability_calendar)s has been enabled on desk %(desk)s.'

  		




  
  1777
  
    
                )

  		




  
  1778
  
    
            else:

  		




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

  		




  1774
  1780
  
    
        messages.info(

  		




  1775
  1781
  
    
            self.request, message % {'unavailability_calendar': unavailability_calendar, 'desk': self.desk}

  		




  1776
  1782
  
    
        )

  		




  ......




  2390
  2396
  
    
        source = self.get_object()

  		




  2391
  2397
  
    
        if source.enabled:

  		




  2392
  2398
  
    
            source.disable()

  		




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

  		




  
  2399
  
    
            if source.desk.label:

  		




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

  		




  
  2401
  
    
            else:

  		




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

  		




  2394
  2403
  
    
        else:

  		




  2395
  2404
  
    
            source.enable()

  		




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

  		




  
  2405
  
    
            if source.desk.label:

  		




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

  		




  
  2407
  
    
            else:

  		




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

  		




  2397
  2409
  
    
        messages.info(self.request, message % {'source': source, 'desk': source.desk})

  		




  2398
  2410
  
    
        return HttpResponseRedirect(

  		




  2399
  2411
  
    
            reverse('chrono-manager-agenda-settings', kwargs={'pk': source.desk.agenda_id})

  		




  2400
  
  
    
-