DAV-KA/django-dav-events
1
0
Fork 0
Code Issues 24 Pull Requests Actions Releases Wiki Activity

FIX: some small errors about registrations/participants/payments/permissions.

Browse Source
This commit is contained in:
heinzel
2019-07-03 09:39:56 +02:00
parent 4c079b398f
commit 923b099ba7
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dav_events/templates/dav_events/event_registrations.html
View File

@@ -386,7 +386,7 @@
<input type="hidden" name="form_prefix" value="{{ form.prefix }}"> <input type="hidden" name="form_prefix" value="{{ form.prefix }}">
<input type="hidden" name="{{ form.prefix }}-id" value="{{ participant.id }}"> <input type="hidden" name="{{ form.prefix }}-id" value="{{ participant.id }}">
{% include './includes/participant_form.html' %} {% include './includes/participant_form.html' %}
{% if not has_permission_update_participants %} {% if has_permission_update_participants %}
<button type="submit" name="action" value="update_participant" class="btn btn-success"> <button type="submit" name="action" value="update_participant" class="btn btn-success">
{% bootstrap_icon 'hdd' %} {% trans 'Speichern' %} {% bootstrap_icon 'hdd' %} {% trans 'Speichern' %}
</button> </button>
@@ -401,7 +401,7 @@
{% else %} {% else %}
<div class="panel panel-info"> <div class="panel panel-info">
<div class="panel-body"> <div class="panel-body">
<span class="text-info">{% trans 'Du hast noch keine Teilnehmer hinzugefügt.' %}</span> <span class="text-info">{% trans 'Es wurden noch keine Teilnehmer hinzugefügt.' %}</span>
</div> </div>
</div> </div>
{% endif %} {% endif %}

1
dav_events/templates/dav_events/event_update_form.html
View File

@@ -509,6 +509,7 @@
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
{% bootstrap_field form.internal_note %} {% bootstrap_field form.internal_note %}
{% bootstrap_field form.registration_closed %}
</div> </div>
</div> </div>
<div class="row"> <div class="row">

2
dav_events/views/events.py
View File

@@ -476,7 +476,7 @@ class EventUpdateView(EventPermissionMixin, generic.UpdateView):
def get_form(self, form_class=None): def get_form(self, form_class=None):
form = super(EventUpdateView, self).get_form(form_class) 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['registration_howto'].disabled = True
form.fields['planned_publication_date'].disabled = True form.fields['planned_publication_date'].disabled = True
form.fields['planned_publication_date'].widget = forms.generic.forms.HiddenInput() form.fields['planned_publication_date'].widget = forms.generic.forms.HiddenInput()