entrouvert
/
chrono
14
1
Fork 0
Code Issues Pull Requests 4 Releases Wiki Activity

manager: fix import of virtual agendas (#78897)
gitea/chrono/pipeline/head This commit looks good Details

This commit is contained in:
Valentin Deniaud 2023-06-22 14:39:02 +02:00
parent dae3c05148
commit f9ae449f7c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chrono/manager/utils.py
View File

@ -53,7 +53,7 @@ def export_site(
qs = Agenda.objects.all()
if agendas != 'all':
qs = qs.filter(category=agendas)
data['agendas'] = [x.export_json() for x in sorted(qs, key=lambda x: x == 'virtual')]
data['agendas'] = [x.export_json() for x in sorted(qs, key=lambda x: x.kind == 'virtual')]
if shared_custody:
data['shared_custody_settings'] = SharedCustodySettings.get_singleton().export_json()
return data

4
tests/test_import_export.py
View File

@ -516,7 +516,7 @@ def test_import_export_virtual_agenda(app):
def test_import_export_virtual_agenda_with_included_agenda(app):
virtual_agenda = Agenda.objects.create(label='Virtual Agenda', kind='virtual')
foo_agenda = Agenda.objects.create(label='Foo', kind='meetings')
foo_agenda = Agenda.objects.create(label='Zoo', kind='meetings')
bar_agenda = Agenda.objects.create(label='Bar', kind='meetings')
mt1 = MeetingType.objects.create(agenda=foo_agenda, label='Meeting Type', duration=30)
mt2 = MeetingType.objects.create(agenda=bar_agenda, label='Meeting Type', duration=30)
@ -534,7 +534,7 @@ def test_import_export_virtual_agenda_with_included_agenda(app):
virtual_agenda = Agenda.objects.get(label='Virtual Agenda', slug='virtual-agenda', kind='virtual')
assert virtual_agenda.real_agendas.count() == 2
assert virtual_agenda.real_agendas.filter(label='Foo').count() == 1
assert virtual_agenda.real_agendas.filter(label='Zoo').count() == 1
assert virtual_agenda.real_agendas.filter(label='Bar').count() == 1
# add incompatible meetingtype