Refactorise le formulaire

zds/tutorialv2/tests/tests_views/tests_editcategoriesview.py

@@ -6,6 +6,7 @@
 from zds.tutorialv2.tests import TutorialTestMixin, override_for_contents
 from zds.member.tests.factories import ProfileFactory, StaffProfileFactory
 from zds.tutorialv2.tests.factories import PublishableContentFactory
+from zds.tutorialv2.views.categories import EditCategoriesForm
 from zds.utils.tests.factories import SubCategoryFactory
 
 
@@ -128,5 +129,5 @@ def test_remove_published(self):
 
         form_data = {"subcategory": []}
         response = self.client.post(self.url, form_data, follow=True)
-        self.assertContains(response, escape("car ce contenu est déjà publié."))
+        self.assertContains(response, escape(EditCategoriesForm.error_messages["no_category_but_public"]))
         self.assertQuerysetEqual(self.content.subcategory.all(), [self.category_0])

zds/tutorialv2/views/categories.py

@@ -3,7 +3,7 @@
 from crispy_forms.layout import Layout, Field
 
 from django import forms
-from django.contrib import messages
+from django.core.exceptions import ValidationError
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 from django.views.generic import FormView
@@ -22,9 +22,15 @@ class EditCategoriesForm(forms.Form):
         widget=forms.CheckboxSelectMultiple(),
     )
 
-    def __init__(self, *args, **kwargs):
+    error_messages = {
+        "no_category_but_public": _("Vous devez choisir au moins une catégorie, car ce contenu est déjà publié.")
+    }
+
+    def __init__(self, content, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
+        self.content = content
+
         self.helper = FormHelper()
         self.helper.form_class = "content-wrapper"
         self.helper.form_method = "post"
@@ -33,6 +39,13 @@ def __init__(self, *args, **kwargs):
             StrictButton(_("Valider"), type="submit"),
         )
 
+    def clean_subcategory(self):
+        subcategory = self.cleaned_data["subcategory"]
+        # Forbid removing all categories of a validated content
+        if self.content.in_public() and not subcategory:
+            raise ValidationError(message=self.error_messages["no_category_but_public"])
+        return subcategory
+
 
 class EditCategoriesView(LoggedWithReadWriteHability, SingleContentFormViewMixin, FormView):
     template_name = "tutorialv2/edit/categories.html"
@@ -44,21 +57,18 @@ def get_initial(self):
         initial["subcategory"] = self.object.subcategory.all()
         return initial
 
+    def get_form_kwargs(self):
+        kwargs = super().get_form_kwargs()
+        kwargs["content"] = self.object
+        return kwargs
+
     def form_valid(self, form):
-        publishable = self.object
+        content = self.object
 
-        # Forbid removing all categories of a validated content
-        if publishable.in_public() and not form.cleaned_data["subcategory"]:
-            messages.error(
-                self.request, _("Vous devez choisir au moins une catégorie, car ce contenu est déjà publié.")
-            )
-            return self.form_invalid(form)
-
-        # Update categories
-        publishable.subcategory.clear()
+        content.subcategory.clear()
         for subcat in form.cleaned_data["subcategory"]:
-            publishable.subcategory.add(subcat)
+            content.subcategory.add(subcat)
 
-        self.success_url = reverse("content:view", args=[publishable.pk, publishable.slug])
+        self.success_url = reverse("content:view", args=[content.pk, content.slug])
 
         return super().form_valid(form)