Add internal comment to events

This commit is contained in:
Raphael Michel
2017-07-07 11:27:59 +02:00
parent 6e65ae5306
commit 35979ed332
10 changed files with 118 additions and 10 deletions

View File

@@ -13,6 +13,7 @@ from django.utils.translation import ugettext_lazy as _
from pretix.base.models import (
Item, Order, OrderPosition, Voucher, WaitingListEntry,
)
from pretix.control.forms.event import CommentForm
from pretix.control.signals import (
event_dashboard_widgets, user_dashboard_widgets,
)
@@ -239,6 +240,7 @@ def event_index(request, organizer, event):
'widgets': rearrange(widgets),
'logs': qs[:5],
'actions': a_qs[:5] if can_change_orders else [],
'comment_form': CommentForm(initial={'comment': request.event.comment})
}
for a in ctx['actions']:

View File

@@ -8,7 +8,9 @@ from django.contrib.contenttypes.models import ContentType
from django.core.files import File
from django.core.urlresolvers import reverse
from django.db import transaction
from django.http import HttpResponse, HttpResponseBadRequest, JsonResponse
from django.http import (
HttpResponse, HttpResponseBadRequest, HttpResponseNotAllowed, JsonResponse,
)
from django.shortcuts import get_object_or_404, redirect
from django.utils import translation
from django.utils.formats import date_format
@@ -28,7 +30,7 @@ from pretix.base.services import tickets
from pretix.base.services.invoices import build_preview_invoice_pdf
from pretix.base.signals import event_live_issues, register_ticket_outputs
from pretix.control.forms.event import (
DisplaySettingsForm, EventSettingsForm, EventUpdateForm,
CommentForm, DisplaySettingsForm, EventSettingsForm, EventUpdateForm,
InvoiceSettingsForm, MailSettingsForm, PaymentSettingsForm, ProviderForm,
TicketSettingsForm,
)
@@ -757,3 +759,29 @@ class EventActionDiscard(EventPermissionRequiredMixin, View):
'organizer': self.request.event.organizer.slug,
'event': self.request.event.slug
})
class EventComment(EventPermissionRequiredMixin, View):
permission = 'can_change_event_settings'
def post(self, *args, **kwargs):
form = CommentForm(self.request.POST)
if form.is_valid():
self.request.event.comment = form.cleaned_data.get('comment')
self.request.event.save()
self.request.event.log_action('pretix.event.comment', user=self.request.user, data={
'new_comment': form.cleaned_data.get('comment')
})
messages.success(self.request, _('The comment has been updated.'))
else:
messages.error(self.request, _('Could not update the comment.'))
return redirect(self.get_success_url())
def get(self, *args, **kwargs):
return HttpResponseNotAllowed(['POST'])
def get_success_url(self) -> str:
return reverse('control:event.index', kwargs={
'organizer': self.request.event.organizer.slug,
'event': self.request.event.slug
})

View File

@@ -181,7 +181,9 @@ class OrderComment(OrderView):
if form.is_valid():
self.order.comment = form.cleaned_data.get('comment')
self.order.save()
self.order.log_action('pretix.event.order.comment', user=self.request.user)
self.order.log_action('pretix.event.order.comment', user=self.request.user, data={
'new_comment': form.cleaned_data.get('comment')
})
messages.success(self.request, _('The comment has been updated.'))
else:
messages.error(self.request, _('Could not update the comment.'))