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)
gitea/chrono/pipeline/head There was a failure building this commit Details

This commit is contained in:
Yann Weber 2024-01-23 14:39:03 +01:00
parent f2285f7880
commit fbb5dc0327
2 changed files with 14 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:

13
tests/manager/test_all.py
View File

@ -479,6 +479,19 @@ 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, manager_user):
settings.PARTIAL_BOOKING_ENABLED = True
agenda = Agenda.objects.create(label='Foobar')
app = login(app, username='manager', password='manager')
resp = app.get('/manage/agendas/%s/settings' % agenda.id)
resp = resp.click('Configure', href='roles')
resp.form['edit_role'] = manager_user.groups.all()[0].pk
resp = resp.form.submit().follow()
assert 'Edit Role: Managers' in resp.text
def test_options_agenda_redirect(app, admin_user):
agenda = Agenda.objects.create(label='Foo Bar')