ramon
/
skillbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects 1 Releases 1 Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
server/books/models/module.py
View File

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