Projet

Général

Profil

0001-family-display-past-events-in-weekly-agenda-cell-572.patch

Lauréline Guérin, 24 septembre 2021 09:05

Télécharger (2,49 ko)

Voir les différences: 

Subject: [PATCH] family: display past events in weekly agenda cell (#57238)


 combo/apps/family/models.py | 3 +--
 tests/test_family.py        | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)
combo/apps/family/models.py
80 80 
        chrono_url = chrono.get('url') or ''
81 81 
        if not chrono_url.endswith('/'):
82 82 
            chrono_url += '/'
83 
        # XXX events=all param is not supported for now
84 
        return '%sapi/agendas/datetimes/?agendas=%s&user_external_id=%s' % (
83 
        return '%sapi/agendas/datetimes/?agendas=%s&user_external_id=%s&show_past_events=true' % (
85 84 
            chrono_url,
86 85 
            self.agenda_reference,
87 86 
            self.user_external_template,
tests/test_family.py
67 67 
        # wrong url
68 68 
        assert (
69 69 
            requests_get.call_args_list[0][0][0]
70 
            == 'http://chrono.example.org/api/agendas/datetimes/?agendas=&user_external_id='
70 
            == 'http://chrono.example.org/api/agendas/datetimes/?agendas=&user_external_id=&show_past_events=true'
71 71 
        )
72 72 

  		




  73
  73
  
    
    cell.agenda_reference = 'some-agenda'

  		




  ......




  78
  78
  
    
        cell.render(context)

  		




  79
  79
  
    
        assert (

  		




  80
  80
  
    
            requests_get.call_args_list[0][0][0]

  		




  81
  
  
    
            == 'http://chrono.example.org/api/agendas/datetimes/?agendas=some-agenda&user_external_id='

  		




  
  81
  
    
            == 'http://chrono.example.org/api/agendas/datetimes/?agendas=some-agenda&user_external_id=&show_past_events=true'

  		




  82
  82
  
    
        )

  		




  83
  83
  
    

  		




  84
  84
  
    
    cell.user_external_template = 'some-key:{{ user_nameid }}'

  		




  ......




  88
  88
  
    
        cell.render(context)

  		




  89
  89
  
    
        assert (

  		




  90
  90
  
    
            requests_get.call_args_list[0][0][0]

  		




  91
  
  
    
            == 'http://chrono.example.org/api/agendas/datetimes/?agendas=some-agenda&user_external_id=some-key:xyz'

  		




  
  91
  
    
            == 'http://chrono.example.org/api/agendas/datetimes/?agendas=some-agenda&user_external_id=some-key:xyz&show_past_events=true'

  		




  92
  92
  
    
        )

  		




  93
  
  
    
-