Remove extended models

photologue_custom/forms.py

@@ -5,19 +5,7 @@ from crispy_forms.layout import Div, Layout, Submit
 from django import forms
 from django.utils.text import slugify
 from django.utils.translation import gettext_lazy as _
-from photologue.models import Gallery
-from taggit.models import Tag
-
-from .models import GalleryExtended
-
-
-class GalleryChoiceField(forms.ModelChoiceField):
-    def label_from_instance(self, obj):
-        """Show gallery event date."""
-        if hasattr(obj, 'extended'):
-            return f"{ obj.title } ({obj.extended.date_start})"
-        else:
-            return obj.title
+from photologue.models import Gallery, Tag
 
 
 class UploadForm(forms.Form):
@@ -29,7 +17,7 @@ class UploadForm(forms.Form):
             'class': 'mb-3',
         }),
     )
-    gallery = GalleryChoiceField(
+    gallery = forms.ModelChoiceField(
         Gallery.objects.all(),
         label=_('Gallery'),
         required=False,
@@ -100,12 +88,12 @@ class UploadForm(forms.Form):
         if not gallery:
             # Create new gallery
             title = self.cleaned_data.get('new_gallery_title')
-            gallery = Gallery.objects.create(title=title, slug=slugify(title))
-            ext = GalleryExtended.objects.create(
-                gallery=gallery,
+            gallery = Gallery.objects.create(
+                title=title,
+                slug=slugify(title),
                 date_start=self.cleaned_data['new_gallery_date_start'],
                 date_end=self.cleaned_data['new_gallery_date_end'],
             )
             for tag in self.cleaned_data['new_gallery_tags']:
-                ext.tags.add(tag)
+                gallery.tags.add(tag)
         return gallery