diff --git a/fet2020/gallery/models.py b/fet2020/gallery/models.py index 66ac62e8..eb7a3dfd 100644 --- a/fet2020/gallery/models.py +++ b/fet2020/gallery/models.py @@ -44,15 +44,15 @@ class Album(models.Model): def __str__(self): return self.title - def get_absolute_url(self): - return reverse("gallery:album", kwargs={"slug": self.slug}) - def save(self, *args, **kwargs): if not self.slug: self.slug = slugify(self.title) super().save(*args, **kwargs) + def get_absolute_url(self): + return reverse("gallery:album", kwargs={"slug": self.slug}) + def get_images(self): return get_image_list(self.folder_name) diff --git a/fet2020/intern/models.py b/fet2020/intern/models.py index 0d2072bb..09ba31e3 100644 --- a/fet2020/intern/models.py +++ b/fet2020/intern/models.py @@ -170,11 +170,10 @@ class Etherpad(models.Model): params={"length": len(pad_name), "pad_name": pad_name}, ) - self.etherpad_key = create_pad(pad_name) - if not self.etherpad_key: - raise ValidationError( - _(f"Etherpad '{pad_name}' konnte nicht erstellt werden."), - ) + if self.etherpad_key is None: + self.etherpad_key = create_pad(pad_name) + if self.etherpad_key is None: + raise ValidationError(f"Etherpad '{pad_name}' konnte nicht erstellt werden.") @property def etherpad_html(self): diff --git a/fet2020/templates/base.html b/fet2020/templates/base.html index 7c97192c..7b38624f 100644 --- a/fet2020/templates/base.html +++ b/fet2020/templates/base.html @@ -78,7 +78,7 @@ x-transition:leave-start="scale-100 opacity-90" x-transition:leave-end="scale-0 opacity-0" > - + @@ -212,7 +212,8 @@ {% endif %}
© {% now 'Y' %} FET - Alle Rechte vorbehalten. {% version %}.
+© {% now 'Y' %} FET - Alle Rechte vorbehalten.
+{% version %}.