Add event meta-data

src/pretix/control/views/event.py

@@ -28,13 +28,14 @@ from pretix.base.models import (
     CachedTicket, Event, Item, ItemVariation, LogEntry, Order, OrderPosition,
     RequiredAction, TaxRule, Voucher,
 )
+from pretix.base.models.event import EventMetaValue
 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 (
-    CommentForm, DisplaySettingsForm, EventSettingsForm, EventUpdateForm,
-    InvoiceSettingsForm, MailSettingsForm, PaymentSettingsForm, ProviderForm,
-    TaxRuleForm, TicketSettingsForm,
+    CommentForm, DisplaySettingsForm, EventMetaValueForm, EventSettingsForm,
+    EventUpdateForm, InvoiceSettingsForm, MailSettingsForm,
+    PaymentSettingsForm, ProviderForm, TaxRuleForm, TicketSettingsForm,
 )
 from pretix.control.permissions import EventPermissionRequiredMixin
 from pretix.helpers.urls import build_absolute_uri
@@ -44,7 +45,39 @@ from . import CreateView, UpdateView
 from ..logdisplay import OVERVIEW_BLACKLIST
 
 
-class EventUpdate(EventPermissionRequiredMixin, UpdateView):
+class MetaDataEditorMixin:
+    meta_form = EventMetaValueForm
+    meta_model = EventMetaValue
+
+    @cached_property
+    def meta_forms(self):
+        val_instances = {
+            v.property_id: v for v in self.object.meta_values.all()
+        }
+
+        formlist = []
+
+        for p in self.request.organizer.meta_properties.all():
+            formlist.append(self._make_meta_form(p, val_instances))
+        return formlist
+
+    def _make_meta_form(self, p, val_instances):
+        return self.meta_form(
+            prefix='prop-{}'.format(p.pk),
+            property=p,
+            instance=val_instances.get(p.pk, self.meta_model(property=p, event=self.object)),
+            data=(self.request.POST if self.request.method == "POST" else None)
+        )
+
+    def save_meta(self):
+        for f in self.meta_forms:
+            if f.cleaned_data.get('value'):
+                f.save()
+            elif f.instance and f.instance.pk:
+                f.delete()
+
+
+class EventUpdate(EventPermissionRequiredMixin, MetaDataEditorMixin, UpdateView):
     model = Event
     form_class = EventUpdateForm
     template_name = 'pretixcontrol/event/settings.html'
@@ -68,11 +101,14 @@ class EventUpdate(EventPermissionRequiredMixin, UpdateView):
     def get_context_data(self, *args, **kwargs) -> dict:
         context = super().get_context_data(*args, **kwargs)
         context['sform'] = self.sform
+        context['meta_forms'] = self.meta_forms
         return context
 
     @transaction.atomic
     def form_valid(self, form):
         self.sform.save()
+        self.save_meta()
+
         if self.sform.has_changed():
             self.request.event.log_action('pretix.event.settings', user=self.request.user, data={
                 k: self.request.event.settings.get(k) for k in self.sform.changed_data
@@ -92,7 +128,7 @@ class EventUpdate(EventPermissionRequiredMixin, UpdateView):
 
     def post(self, request, *args, **kwargs):
         form = self.get_form()
-        if form.is_valid() and self.sform.is_valid():
+        if form.is_valid() and self.sform.is_valid() and all([f.is_valid() for f in self.meta_forms]):
             # reset timezone
             zone = timezone(self.sform.cleaned_data['timezone'])
             event = form.instance

src/pretix/control/views/organizer.py

@@ -5,6 +5,7 @@ from django.core.files import File
 from django.core.urlresolvers import reverse
 from django.db import transaction
 from django.db.models import Count
+from django.forms import inlineformset_factory
 from django.shortcuts import get_object_or_404, redirect
 from django.utils.functional import cached_property
 from django.utils.translation import ugettext_lazy as _
@@ -13,10 +14,12 @@ from django.views.generic import (
 )
 
 from pretix.base.models import Organizer, Team, TeamInvite, User
+from pretix.base.models.event import EventMetaProperty
 from pretix.base.models.organizer import TeamAPIToken
 from pretix.base.services.mail import SendMailException, mail
 from pretix.control.forms.organizer import (
-    OrganizerForm, OrganizerSettingsForm, OrganizerUpdateForm, TeamForm,
+    EventMetaPropertyForm, OrganizerForm, OrganizerSettingsForm,
+    OrganizerUpdateForm, TeamForm,
 )
 from pretix.control.permissions import OrganizerPermissionRequiredMixin
 from pretix.control.signals import nav_organizer
@@ -108,10 +111,12 @@ class OrganizerUpdate(OrganizerPermissionRequiredMixin, UpdateView):
     def get_context_data(self, *args, **kwargs) -> dict:
         context = super().get_context_data(*args, **kwargs)
         context['sform'] = self.sform
+        context['formset'] = self.formset
         return context
 
     @transaction.atomic
     def form_valid(self, form):
+        self.save_formset(self.object)
         self.sform.save()
         if self.sform.has_changed():
             self.request.organizer.log_action(
@@ -145,12 +150,40 @@ class OrganizerUpdate(OrganizerPermissionRequiredMixin, UpdateView):
         })
 
     def post(self, request, *args, **kwargs):
+        self.object = self.get_object()
         form = self.get_form()
-        if form.is_valid() and self.sform.is_valid():
+        if form.is_valid() and self.sform.is_valid() and self.formset.is_valid():
             return self.form_valid(form)
         else:
             return self.form_invalid(form)
 
+    @cached_property
+    def formset(self):
+        formsetclass = inlineformset_factory(
+            Organizer, EventMetaProperty,
+            form=EventMetaPropertyForm, can_order=False, can_delete=True, extra=0
+        )
+        return formsetclass(self.request.POST if self.request.method == "POST" else None,
+                            instance=self.object, queryset=self.object.meta_properties.all())
+
+    def save_formset(self, obj):
+        for form in self.formset.initial_forms:
+            if form in self.formset.deleted_forms:
+                if not form.instance.pk:
+                    continue
+                form.instance.delete()
+                form.instance.pk = None
+            elif form.has_changed():
+                form.save()
+
+        for form in self.formset.extra_forms:
+            if not form.has_changed():
+                continue
+            if self.formset._should_delete_form(form):
+                continue
+            form.instance.organizer = obj
+            form.save()
+
 
 class OrganizerCreate(CreateView):
     model = Organizer

src/pretix/control/views/subevents.py

@@ -9,14 +9,16 @@ from django.utils.functional import cached_property
 from django.utils.translation import pgettext_lazy, ugettext_lazy as _
 from django.views.generic import CreateView, DeleteView, ListView, UpdateView
 
-from pretix.base.models.event import SubEvent
+from pretix.base.models.event import SubEvent, SubEventMetaValue
 from pretix.base.models.items import Quota, SubEventItem, SubEventItemVariation
 from pretix.control.forms.filter import SubEventFilterForm
 from pretix.control.forms.item import QuotaForm
 from pretix.control.forms.subevents import (
     QuotaFormSet, SubEventForm, SubEventItemForm, SubEventItemVariationForm,
+    SubEventMetaValueForm,
 )
 from pretix.control.permissions import EventPermissionRequiredMixin
+from pretix.control.views.event import MetaDataEditorMixin
 
 
 class SubEventList(EventPermissionRequiredMixin, ListView):
@@ -85,7 +87,22 @@ class SubEventDelete(EventPermissionRequiredMixin, DeleteView):
         })
 
 
-class SubEventEditorMixin:
+class SubEventEditorMixin(MetaDataEditorMixin):
+    meta_form = SubEventMetaValueForm
+    meta_model = SubEventMetaValue
+
+    def _make_meta_form(self, p, val_instances):
+        if not hasattr(self, '_default_meta'):
+            self._default_meta = self.request.event.meta_data
+
+        return self.meta_form(
+            prefix='prop-{}'.format(p.pk),
+            property=p,
+            default=self._default_meta.get(p.name, ''),
+            instance=val_instances.get(p.pk, self.meta_model(property=p, subevent=self.object)),
+            data=(self.request.POST if self.request.method == "POST" else None)
+        )
+
     @cached_property
     def formset(self):
         extra = 0
@@ -159,6 +176,7 @@ class SubEventEditorMixin:
         ctx = super().get_context_data(**kwargs)
         ctx['formset'] = self.formset
         ctx['itemvar_forms'] = self.itemvar_forms
+        ctx['meta_forms'] = self.meta_forms
         return ctx
 
     @cached_property
@@ -210,7 +228,9 @@ class SubEventEditorMixin:
         return formlist
 
     def is_valid(self, form):
-        return form.is_valid() and all([f.is_valid() for f in self.itemvar_forms]) and self.formset.is_valid()
+        return form.is_valid() and all([f.is_valid() for f in self.itemvar_forms]) and self.formset.is_valid() and (
+            all([f.is_valid() for f in self.meta_forms])
+        )
 
 
 class SubEventUpdate(EventPermissionRequiredMixin, SubEventEditorMixin, UpdateView):
@@ -239,6 +259,7 @@ class SubEventUpdate(EventPermissionRequiredMixin, SubEventEditorMixin, UpdateVi
     @transaction.atomic
     def form_valid(self, form):
         self.save_formset(self.object)
+        self.save_meta()
 
         for f in self.itemvar_forms:
             f.save()
@@ -308,5 +329,6 @@ class SubEventCreate(SubEventEditorMixin, EventPermissionRequiredMixin, CreateVi
         for f in self.itemvar_forms:
             f.instance.subevent = form.instance
             f.save()
-
+        self.object = form.instance
+        self.save_meta()
         return ret