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

manager: fix agenda's role edition when partial booking enabled (#85999) #209

Merged
yweber merged 1 commits from wip/85999-agenda-edit-role-with-partial-booking into main 2024-01-30 15:30:43 +01:00
Conversation 0 Commits 1 Files Changed 2 +15 -1
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chrono/manager/forms.py
View File

@ -82,7 +82,7 @@ class AgendaAddForm(forms.ModelForm):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
if settings.PARTIAL_BOOKINGS_ENABLED:
if 'kind' in self.fields and settings.PARTIAL_BOOKINGS_ENABLED:
self.fields['kind'].choices += [('partial-bookings', _('Partial bookings'))]
class Meta:

14
tests/manager/test_all.py
View File

@ -479,6 +479,20 @@ def test_add_agenda_and_set_role(app, admin_user, manager_user):
assert agenda.desk_set.count() == 1
def test_agenda_set_role_with_partial_booking(settings, app, admin_user):
settings.PARTIAL_BOOKING_ENABLED = True
group = Group.objects.create(name='testgroup')
agenda = Agenda.objects.create(label='Foobar')
app = login(app)
resp = app.get('/manage/agendas/%s/settings' % agenda.id)
resp = resp.click('Configure', href='roles')
resp.form['edit_role'] = group.pk
resp = resp.form.submit().follow()
assert 'Edit Role: testgroup' in resp.text
def test_options_agenda_redirect(app, admin_user):
agenda = Agenda.objects.create(label='Foo Bar')