Refactor: separate forms from view, improve code style

src/pretix/control/views/main.py

@@ -1,12 +1,11 @@
-from django import forms
 from django.contrib import messages
 from django.core.urlresolvers import reverse
 from django.shortcuts import render
 from django.views.generic import ListView, CreateView, TemplateView
 from django.utils.translation import ugettext_lazy as _
-from pretix.base.forms import VersionedModelForm
 
-from pretix.base.models import Event, EventPermission, Organizer, OrganizerPermission
+from pretix.base.models import Event, EventPermission, OrganizerPermission
+from pretix.control.forms.event import EventCreateForm
 from pretix.control.permissions import OrganizerPermissionRequiredMixin
 
 
@@ -28,37 +27,6 @@ def index(request):
     return render(request, 'pretixcontrol/base.html', {})
 
 
-class EventForm(VersionedModelForm):
-    error_messages = {
-        'duplicate_slug': _("You already used this slug for a different event. Please choose a new one."),
-    }
-
-    class Meta:
-        model = Event
-        fields = [
-            'name',
-            'slug',
-            'currency',
-            'date_from',
-            'date_to',
-            'presale_start',
-            'presale_end'
-        ]
-
-    def __init__(self, *args, **kwargs):
-        self.organizer = kwargs.pop('organizer')
-        super().__init__(*args, **kwargs)
-
-    def clean_slug(self):
-        slug = self.cleaned_data['slug']
-        if Event.objects.filter(slug=slug, organizer=self.organizer).exists():
-            raise forms.ValidationError(
-                self.error_messages['duplicate_slug'],
-                code='duplicate_slug',
-            )
-        return slug
-
-
 class EventCreateStart(TemplateView):
     template_name = 'pretixcontrol/events/start.html'
 
@@ -74,7 +42,7 @@ class EventCreateStart(TemplateView):
 
 class EventCreate(OrganizerPermissionRequiredMixin, CreateView):
     model = Event
-    form_class = EventForm
+    form_class = EventCreateForm
     template_name = 'pretixcontrol/events/create.html'
     context_object_name = 'event'
     permission = 'can_create_events'