Add internal comment to events

src/pretix/control/forms/event.py

@@ -697,3 +697,15 @@ class TicketSettingsForm(SettingsForm):
             val = cleaned_data.get(k)
             if v._required and (val is None or val == ""):
                 self.add_error(k, _('This field is required.'))
+
+
+class CommentForm(I18nModelForm):
+    class Meta:
+        model = Event
+        fields = ['comment']
+        widgets = {
+            'comment': forms.Textarea(attrs={
+                'rows': 3,
+                'class': 'helper-width-100',
+            }),
+        }

src/pretix/control/logdisplay.py

@@ -76,6 +76,7 @@ def _display_order_changed(event: Event, logentry: LogEntry):
 @receiver(signal=logentry_display, dispatch_uid="pretixcontrol_logentry_display")
 def pretixcontrol_logentry_display(sender: Event, logentry: LogEntry, **kwargs):
     plains = {
+        'pretix.event.comment': _('The event\'s internal comment has been updated.'),
         'pretix.event.order.modified': _('The order details have been modified.'),
         'pretix.event.order.unpaid': _('The order has been marked as unpaid.'),
         'pretix.event.order.resend': _('The link to the order detail page has been resent to the user.'),

src/pretix/control/templates/pretixcontrol/event/index.html

@@ -1,12 +1,13 @@
 {% extends "pretixcontrol/event/base.html" %}
 {% load i18n %}
 {% load eventurl %}
+{% load bootstrap3 %}
 {% load staticfiles %}
 {% block title %}{{ request.event.name }}{% endblock %}
 {% block content %}
-<h1>
-    {{ request.event.name }}            
-</h1>
+    <h1>
+        {{ request.event.name }}
+    </h1>
     {% if actions|length > 0 %}
         <div class="panel panel-danger">
             <div class="panel-heading">
@@ -19,10 +20,12 @@
                     <li class="list-group-item logentry">
                         <p>
                             <a href="{% url "control:event.requiredaction.discard" event=request.event.slug organizer=request.event.organizer.slug id=action.id %}"
-                                    class="btn btn-default btn-xs pull-right">
+                               class="btn btn-default btn-xs pull-right">
                                 {% trans "Hide message" %}
                             </a>
-                            <small><span class="fa fa-clock-o"></span> {{ action.datetime|date:"SHORT_DATETIME_FORMAT" }}</small>
+                            <small><span
+                                    class="fa fa-clock-o"></span> {{ action.datetime|date:"SHORT_DATETIME_FORMAT" }}
+                            </small>
                         </p>
                         {{ action.display|safe }}
                     </li>
@@ -57,6 +60,28 @@
     </div>
 
     <p>&nbsp;</p>
+    <div class="panel panel-default items">
+        <div class="panel-heading">
+            <h3 class="panel-title">
+                {% trans "Internal comment" %}
+            </h3>
+        </div>
+        <div class="panel-body">
+            <form class="form" method="post"
+                  action="{% url "control:event.comment" event=request.event.slug organizer=request.event.organizer.slug %}">
+                {% csrf_token %}
+                <div class="row">
+                    {% bootstrap_field comment_form.comment layout="horizontal" show_help=True show_label=False horizontal_field_class="col-md-12" %}
+                </div>
+                <p class="text-right">
+                    <br>
+                    <button class="btn btn-default">
+                        {% trans "Update comment" %}
+                    </button>
+                </p>
+            </form>
+        </div>
+    </div>
     <div class="panel panel-default">
         <div class="panel-heading">
             <h3 class="panel-title">
@@ -74,8 +99,8 @@
                             {% if log.user %}
                                 {% if log.user.is_superuser %}
                                     <span class="fa fa-id-card fa-danger fa-fw"
-                                            data-toggle="tooltip"
-                                            title="{% trans "This change was performed by a pretix administrator." %}">
+                                          data-toggle="tooltip"
+                                          title="{% trans "This change was performed by a pretix administrator." %}">
                                 </span>
                                 {% else %}
                                     <span class="fa fa-user fa-fw"></span>

src/pretix/control/urls.py

@@ -55,6 +55,8 @@ urlpatterns = [
         url(r'^requiredactions/$', event.EventActions.as_view(), name='event.requiredactions'),
         url(r'^requiredactions/(?P<id>\d+)/discard$', event.EventActionDiscard.as_view(),
             name='event.requiredaction.discard'),
+        url(r'^comment/$', event.EventComment.as_view(),
+            name='event.comment'),
         url(r'^settings/$', event.EventUpdate.as_view(), name='event.settings'),
         url(r'^settings/plugins$', event.EventPlugins.as_view(), name='event.settings.plugins'),
         url(r'^settings/permissions$', event.EventPermissions.as_view(), name='event.settings.permissions'),

src/pretix/control/views/dashboards.py

@@ -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']:

src/pretix/control/views/event.py

@@ -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
+        })

src/pretix/control/views/orders.py

@@ -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.'))