Remove Clean Module form

This commit is contained in:
Lorenz Padberg 2024-04-12 12:07:48 +02:00
parent 547dc29134
commit be4dac3b51
1 changed files with 21 additions and 17 deletions

View File

@ -52,22 +52,23 @@ class ModuleCategory(models.Model):
def __str__(self):
return f"{self.name}"
class ModulePageForm(WagtailAdminPageForm):
def clean(self):
cleaned_data = super().clean()
print("cleaning")
if "slug" in self.cleaned_data:
page_slug = cleaned_data["slug"]
if not Module._slug_is_available(page_slug, self.parent_page, self.instance):
self.add_error(
"slug",
forms.ValidationError(
_("The slug '%(page_slug)s' is already in use")
% {"page_slug": page_slug}
),
)
return cleaned_data
# Commented out since that check is not necessary if a slug is chosen that is already in use
# a new one will be generated
# TODO: remove after pullrequest is merged
# class ModulePageForm(WagtailAdminPageForm):
# def clean(self):
# cleaned_data = super().clean()
# if "slug" in self.cleaned_data and "id" in self.cleaned_data:
# page_slug = cleaned_data["slug"]
# if not Module._slug_is_available(page_slug, self.parent_page, self.instance):
# self.add_error(
# "slug",
# forms.ValidationError(
# _("The slug '%(page_slug)s' is already in use")
# % {"page_slug": page_slug}
# ),
# )
# return cleaned_data
class Module(StrictHierarchyPage):
@ -109,6 +110,7 @@ class Module(StrictHierarchyPage):
FieldPanel("teaser"),
FieldPanel("intro"),
]
# TODO remove after pullrequest is merged
#base_form_class = ModulePageForm
edit_handler = TabbedInterface(
@ -218,10 +220,12 @@ class Module(StrictHierarchyPage):
def full_clean(self, *args, **kwargs):
super().full_clean(*args, **kwargs)
# Always create a slug if it is not available
if not self._slug_is_available(self.slug, self.get_parent(), self):
self.slug = self._get_autogenerated_slug(self.slug)
class RecentModule(models.Model):
module = models.ForeignKey(
Module, on_delete=models.CASCADE, related_name="recent_modules"