From 923b099ba73bf0dc8719f891d65995cb95033b14 Mon Sep 17 00:00:00 2001 From: Jens Kleineheismann Date: Wed, 3 Jul 2019 09:39:56 +0200 Subject: [PATCH] FIX: some small errors about registrations/participants/payments/permissions. --- dav_events/templates/dav_events/event_registrations.html | 4 ++-- dav_events/templates/dav_events/event_update_form.html | 1 + dav_events/views/events.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dav_events/templates/dav_events/event_registrations.html b/dav_events/templates/dav_events/event_registrations.html index 3992793..fc63f20 100644 --- a/dav_events/templates/dav_events/event_registrations.html +++ b/dav_events/templates/dav_events/event_registrations.html @@ -386,7 +386,7 @@ {% include './includes/participant_form.html' %} - {% if not has_permission_update_participants %} + {% if has_permission_update_participants %} @@ -401,7 +401,7 @@ {% else %}
- {% trans 'Du hast noch keine Teilnehmer hinzugefügt.' %} + {% trans 'Es wurden noch keine Teilnehmer hinzugefügt.' %}
{% endif %} diff --git a/dav_events/templates/dav_events/event_update_form.html b/dav_events/templates/dav_events/event_update_form.html index 1d3ef79..151b60c 100644 --- a/dav_events/templates/dav_events/event_update_form.html +++ b/dav_events/templates/dav_events/event_update_form.html @@ -509,6 +509,7 @@
{% bootstrap_field form.internal_note %} + {% bootstrap_field form.registration_closed %}
diff --git a/dav_events/views/events.py b/dav_events/views/events.py index 93338b8..07cde08 100644 --- a/dav_events/views/events.py +++ b/dav_events/views/events.py @@ -476,7 +476,7 @@ class EventUpdateView(EventPermissionMixin, generic.UpdateView): def get_form(self, form_class=None): form = super(EventUpdateView, self).get_form(form_class) - if not self.has_permission('accept', self.object): + if not (self.has_permission('accept', self.object) or self.has_permission('publish', self.object)): form.fields['registration_howto'].disabled = True form.fields['planned_publication_date'].disabled = True form.fields['planned_publication_date'].widget = forms.generic.forms.HiddenInput()