entrouvert
/
combo
16
1
Fork 0
Code Issues Pull Requests 12 Releases Wiki Activity

family: display past events in weekly agenda cell (#57238)
gitea-wip/combo/pipeline/head There was a failure building this commit Details
gitea/combo/pipeline/head Build started... Details

This commit is contained in:
Lauréline Guérin 2021-09-24 09:04:40 +02:00
parent eb11afca1b
commit 8e577d006f
No known key found for this signature in database
GPG Key ID: 1FAB9B9B4F93D473
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
combo/apps/family/models.py
View File

@ -80,8 +80,7 @@ class WeeklyAgendaCell(JsonCellBase):
chrono_url = chrono.get('url') or ''
if not chrono_url.endswith('/'):
chrono_url += '/'
# XXX events=all param is not supported for now
return '%sapi/agendas/datetimes/?agendas=%s&user_external_id=%s' % (
return '%sapi/agendas/datetimes/?agendas=%s&user_external_id=%s&show_past_events=true' % (
chrono_url,
self.agenda_reference,
self.user_external_template,

6
tests/test_family.py
View File

@ -67,7 +67,7 @@ def test_weeklyagenda_cell(settings, context):
# wrong url
assert (
requests_get.call_args_list[0][0][0]
== 'http://chrono.example.org/api/agendas/datetimes/?agendas=&user_external_id='
== 'http://chrono.example.org/api/agendas/datetimes/?agendas=&user_external_id=&show_past_events=true'
)
cell.agenda_reference = 'some-agenda'
@ -78,7 +78,7 @@ def test_weeklyagenda_cell(settings, context):
cell.render(context)
assert (
requests_get.call_args_list[0][0][0]
== 'http://chrono.example.org/api/agendas/datetimes/?agendas=some-agenda&user_external_id='
== 'http://chrono.example.org/api/agendas/datetimes/?agendas=some-agenda&user_external_id=&show_past_events=true'
)
cell.user_external_template = 'some-key:{{ user_nameid }}'
@ -88,5 +88,5 @@ def test_weeklyagenda_cell(settings, context):
cell.render(context)
assert (
requests_get.call_args_list[0][0][0]
== 'http://chrono.example.org/api/agendas/datetimes/?agendas=some-agenda&user_external_id=some-key:xyz'
== 'http://chrono.example.org/api/agendas/datetimes/?agendas=some-agenda&user_external_id=some-key:xyz&show_past_events=true'
)