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

Fixed error with enforcing permission on accept.

Browse Source
This commit is contained in:
heinzel
2018-01-30 22:30:37 +01:00
parent 512d0887a3
commit a73e3027d3
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dav_events/templates/dav_events/event_detail.html
View File

@@ -38,8 +38,7 @@
</li> </li>
<li class="{% if not has_permission_accept %}disabled{% endif %}"> <li class="{% if not has_permission_accept %}disabled{% endif %}">
<a class="btn {% if has_permission_accept %}btn-success{% else %}disabled{% endif %}" <a class="btn {% if has_permission_accept %}btn-success{% else %}disabled{% endif %}"
data-toggle="modal" data-target="#modal-accept-dialog" data-toggle="modal" data-target="#modal-accept-dialog">{% trans 'Freigeben' %}</a>
ihref="{% url 'dav_events:event_accept' event.pk %}">{% trans 'Freigeben' %}</a>
</li> </li>
<li class="{% if not has_permission_update %}disabled{% endif %}"> <li class="{% if not has_permission_update %}disabled{% endif %}">
<a class="btn {% if has_permission_update %}btn-warning{% else %}disabled{% endif %}" <a class="btn {% if has_permission_update %}btn-warning{% else %}disabled{% endif %}"

12
dav_events/views/events.py
View File

@@ -166,14 +166,12 @@ class EventDetailView(EventPermissionMixin, generic.DetailView):
class EventAcceptView(EventDetailView): class EventAcceptView(EventDetailView):
permission = 'accept' permission = 'accept'
def accept(self):
event = self.get_object()
event.accept(self.request.user)
messages.success(self.request, _(u'Veranstaltung freigegeben.'))
def get(self, request, *args, **kwargs): def get(self, request, *args, **kwargs):
self.accept() self.object = self.get_object()
return super(EventAcceptView, self).get(request, *args, **kwargs) self.object.accept(request.user)
messages.success(request, _(u'Veranstaltung freigegeben.'))
context = self.get_context_data(object=self.object)
return self.render_to_response(context)
class EventUpdateView(EventPermissionMixin, generic.UpdateView): class EventUpdateView(EventPermissionMixin, generic.UpdateView):