Projet

Général

Profil

0001-manager-fix-open-events-month-title-50417.patch

Lauréline Guérin, 22 janvier 2021 10:26

Télécharger (2,5 ko)

Voir les différences: 

Subject: [PATCH] manager: fix open events month title (#50417)


 .../chrono/manager_agenda_open_events.html    |  3 ++-
 tests/test_manager.py                         | 25 +++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
chrono/manager/templates/chrono/manager_agenda_open_events.html
19 19 
<div>
20 20 
{% if open_events %}
21 21 
  {% for event in open_events %}
22 
    {% ifchanged event.start_datetime.month event.start_datetime.year %}
22 
    {% ifchanged event.start_datetime|date:'n' event.start_datetime|date:'y' %}
23 
      {% if not forloop.first %}</ul>{% endif %}
23 24 
      <h4>{{ event.start_datetime|date:'YEAR_MONTH_FORMAT'|capfirst }}</h4>
24 25 
      <ul class="objects-list single-links">
25 26 
    {% endifchanged %}
tests/test_manager.py
3227 3227 
    assert 'event E' not in resp.text
3228 3228 
    assert 'event F' in resp.text
3229 3229 

  		




  
  3230
  
    
    # event the first of February in 2 years at 00:00, already publicated

  		




  
  3231
  
    
    # and another event in January in 2 years

  		




  
  3232
  
    
    agenda.minimal_booking_delay = 0

  		




  
  3233
  
    
    agenda.maximal_booking_delay = 0

  		




  
  3234
  
    
    agenda.save()

  		




  
  3235
  
    
    Event.objects.create(

  		




  
  3236
  
    
        agenda=agenda,

  		




  
  3237
  
    
        label='event G',

  		




  
  3238
  
    
        start_datetime=now().replace(year=today.year + 2, month=1, day=15),

  		




  
  3239
  
    
        publication_date=today - datetime.timedelta(days=1),

  		




  
  3240
  
    
        places=42,

  		




  
  3241
  
    
    )

  		




  
  3242
  
    
    Event.objects.create(

  		




  
  3243
  
    
        agenda=agenda,

  		




  
  3244
  
    
        label='event G',

  		




  
  3245
  
    
        start_datetime=localtime(now()).replace(

  		




  
  3246
  
    
            year=today.year + 2, month=2, day=1, hour=0, minute=0, second=0, microsecond=0

  		




  
  3247
  
    
        ),

  		




  
  3248
  
    
        publication_date=today - datetime.timedelta(days=1),

  		




  
  3249
  
    
        places=42,

  		




  
  3250
  
    
    )

  		




  
  3251
  
    
    resp = app.get('/manage/agendas/%s/events/open/' % agenda.pk)

  		




  
  3252
  
    
    assert 'event G' in resp.text

  		




  
  3253
  
    
    assert '<h4>February %s</h4>' % (today.year + 2) in resp.text

  		




  
  3254
  
    

  		




  3230
  3255
  
    
    # not enough permissions

  		




  3231
  3256
  
    
    app.reset()

  		




  3232
  3257
  
    
    app = login(app, username='manager', password='manager')

  		




  3233
  
  
    
-