{% include "tutorialv2/includes/headline/authors.part.html" with db_content=db_content edit_authors=display_config.draft_actions.show_authors_management online_mode=display_config.online_config.enable_authors_online_mode %}
+ {% include "tutorialv2/includes/headline/licence.part.html" with licence=content.licence show_form=display_config.draft_actions.show_license_edit form=form_edit_license %}
{% include "tutorialv2/includes/headline/contributions.part.html" %}
{% include "tutorialv2/includes/headline/categories.part.html" %}
{% include "tutorialv2/includes/headline/goals.part.html" with goals=publishablecontent.goals.all %}
diff --git a/templates/tutorialv2/includes/headline/title.part.html b/templates/tutorialv2/includes/headline/title.part.html
new file mode 100644
index 0000000000..22e89e8753
--- /dev/null
+++ b/templates/tutorialv2/includes/headline/title.part.html
@@ -0,0 +1,43 @@
+{% load i18n %}
+{% load crispy_forms_tags %}
+
+
diff --git a/zds/tutorialv2/forms.py b/zds/tutorialv2/forms.py
index ee75febc87..0c255b6bf7 100644
--- a/zds/tutorialv2/forms.py
+++ b/zds/tutorialv2/forms.py
@@ -22,6 +22,8 @@ class FormWithTitle(forms.Form):
label=_("Titre"), max_length=PublishableContent._meta.get_field("title").max_length, required=False
)
+ error_messages = {"bad_slug": _("Le titre « {} » n'est pas autorisé, car son slug est invalide !")}
+
def clean(self):
cleaned_data = super().clean()
@@ -33,10 +35,8 @@ def clean(self):
try:
slugify_raise_on_invalid(title)
- except InvalidSlugError as e:
- self._errors["title"] = self.error_class(
- [_("Ce titre n'est pas autorisé, son slug est invalide {} !").format(e)]
- )
+ except InvalidSlugError:
+ self._errors["title"] = self.error_class([self.error_messages["bad_slug"].format(title)])
return cleaned_data
@@ -197,6 +197,35 @@ def clean(self):
return cleaned_data
+class EditContentForm(ContentForm):
+ title = None
+ description = None
+ type = None
+
+ def _create_layout(self):
+ self.helper.layout = Layout(
+ IncludeEasyMDE(),
+ Field("image"),
+ Field("introduction", css_class="md-editor preview-source"),
+ StrictButton(_("Aperçu"), type="preview", name="preview", css_class="btn btn-grey preview-btn"),
+ HTML(
+ '{% if form.introduction.value %}{% include "misc/preview.part.html" \
+ with text=form.introduction.value %}{% endif %}'
+ ),
+ Field("conclusion", css_class="md-editor preview-source"),
+ StrictButton(_("Aperçu"), type="preview", name="preview", css_class="btn btn-grey preview-btn"),
+ HTML(
+ '{% if form.conclusion.value %}{% include "misc/preview.part.html" \
+ with text=form.conclusion.value %}{% endif %}'
+ ),
+ Field("last_hash"),
+ Field("source"),
+ Field("subcategory", template="crispy/checkboxselectmultiple.html"),
+ Field("msg_commit"),
+ StrictButton("Valider", type="submit"),
+ )
+
+
class ExtractForm(FormWithTitle):
text = forms.CharField(
label=_("Texte"),
diff --git a/zds/tutorialv2/tests/factories.py b/zds/tutorialv2/tests/factories.py
index 8af7dc244e..174fb0accb 100644
--- a/zds/tutorialv2/tests/factories.py
+++ b/zds/tutorialv2/tests/factories.py
@@ -85,7 +85,7 @@ def _generate(cls, create, attrs):
conclusion_content = attrs.pop("conclusion", text)
publishable_content = super()._generate(create, attrs)
- publishable_content.gallery = GalleryFactory()
+ publishable_content.gallery = GalleryFactory(title=publishable_content.title)
publishable_content.licence = licence
for auth in auths:
publishable_content.authors.add(auth)
diff --git a/zds/tutorialv2/tests/tests_opinion_views.py b/zds/tutorialv2/tests/tests_opinion_views.py
index e5da032c5f..418ca9ada4 100644
--- a/zds/tutorialv2/tests/tests_opinion_views.py
+++ b/zds/tutorialv2/tests/tests_opinion_views.py
@@ -123,20 +123,9 @@ def test_publish_content_change_title_before_watchdog(self, opinions_management)
self.assertEqual(opinion.public_version.sha_public, opinion_draft.current_version)
# Change the title:
- random = "Whatever, we don't care about the details"
result = self.client.post(
- reverse("content:edit", args=[opinion.pk, opinion.slug]),
- {
- "title": "{} ({})".format(opinion.title, "modified"),
- "description": random,
- "introduction": random,
- "conclusion": random,
- "type": "OPINION",
- "licence": opinion.licence.pk,
- "subcategory": opinion.subcategory.first().pk,
- "last_hash": opinion.load_version().compute_hash(),
- "image": (settings.BASE_DIR / "fixtures" / "logo.png").open("rb"),
- },
+ reverse("content:edit-title", args=[opinion.pk]),
+ {"title": f"{opinion.title} (modified)"},
follow=False,
)
self.assertEqual(result.status_code, 302)
diff --git a/zds/tutorialv2/tests/tests_views/tests_content.py b/zds/tutorialv2/tests/tests_views/tests_content.py
index 565727fc62..cf7e9d31c3 100644
--- a/zds/tutorialv2/tests/tests_views/tests_content.py
+++ b/zds/tutorialv2/tests/tests_views/tests_content.py
@@ -303,8 +303,6 @@ def test_basic_tutorial_workflow(self):
result = self.client.post(
reverse("content:edit", args=[pk, slug]),
{
- "title": random,
- "description": random,
"introduction": random,
"conclusion": random,
"type": "TUTORIAL",
@@ -319,17 +317,11 @@ def test_basic_tutorial_workflow(self):
self.assertEqual(Image.objects.filter(gallery__pk=tuto.gallery.pk).count(), 2) # new icon is uploaded
tuto = PublishableContent.objects.get(pk=pk)
- self.assertEqual(tuto.title, random)
- self.assertEqual(tuto.description, random)
self.assertEqual(tuto.licence, None)
versioned = tuto.load_version()
self.assertEqual(versioned.get_introduction(), random)
self.assertEqual(versioned.get_conclusion(), random)
- self.assertEqual(versioned.description, random)
self.assertEqual(versioned.licence, None)
- self.assertNotEqual(versioned.slug, slug)
-
- slug = tuto.slug # make the title change also change the slug !!
# preview container
result = self.client.post(
@@ -632,7 +624,6 @@ def test_history_navigation(self):
self.client.force_login(self.user_author)
tuto = PublishableContent.objects.get(pk=self.tuto.pk)
- versioned = tuto.load_version()
# check access
result = self.client.get(reverse("content:view", args=[tuto.pk, tuto.slug]), follow=False)
@@ -664,21 +655,9 @@ def test_history_navigation(self):
old_slug_tuto = tuto.slug
version_1 = tuto.sha_draft # 'version 1' is the one before any change
- new_licence = LicenceFactory()
- random = "Pâques, c'est bientôt?"
-
result = self.client.post(
- reverse("content:edit", args=[tuto.pk, tuto.slug]),
- {
- "title": random,
- "description": random,
- "introduction": random,
- "conclusion": random,
- "type": "TUTORIAL",
- "licence": new_licence.pk,
- "subcategory": self.subcategory.pk,
- "last_hash": versioned.compute_hash(),
- },
+ reverse("content:edit-title", args=[tuto.pk]),
+ {"title": "Pâques, c'est bientôt?"},
follow=False,
)
self.assertEqual(result.status_code, 302)
@@ -744,6 +723,7 @@ def test_history_navigation(self):
# edit container:
old_slug_part = self.part1.slug
part1 = tuto.load_version().children[0]
+ random = "Un, deux, trois, je vais dans les bois"
result = self.client.post(
reverse(
"content:edit-container", kwargs={"pk": tuto.pk, "slug": tuto.slug, "container_slug": self.part1.slug}
diff --git a/zds/tutorialv2/tests/tests_views/tests_edgecases.py b/zds/tutorialv2/tests/tests_views/tests_edgecases.py
index e035f72610..b07404255b 100644
--- a/zds/tutorialv2/tests/tests_views/tests_edgecases.py
+++ b/zds/tutorialv2/tests/tests_views/tests_edgecases.py
@@ -36,18 +36,8 @@ def test_no_bad_slug_renaming_on_rename(self):
# login with author
self.client.force_login(self.author.user)
result = self.client.post(
- reverse("content:edit", args=[opinion.pk, opinion.slug]),
- {
- "title": "new title",
- "description": "subtitle",
- "introduction": "introduction",
- "conclusion": "conclusion",
- "type": "OPINION",
- "licence": self.licence.pk,
- "subcategory": self.subcategory.pk,
- "last_hash": opinion.load_version().compute_hash(),
- "image": (settings.BASE_DIR / "fixtures" / "logo.png").open("rb"),
- },
+ reverse("content:edit-title", args=[opinion.pk]),
+ {"title": "new title"},
follow=False,
)
self.assertEqual(result.status_code, 302)
@@ -56,18 +46,8 @@ def test_no_bad_slug_renaming_on_rename(self):
result = self.client.get(article.get_absolute_url())
self.assertEqual(200, result.status_code)
result = self.client.post(
- reverse("content:edit", args=[article.pk, article.slug]),
- {
- "title": "title",
- "description": "subtitle",
- "introduction": "introduction",
- "conclusion": "conclusion",
- "type": "ARTICLE",
- "licence": self.licence.pk,
- "subcategory": self.subcategory.pk,
- "last_hash": article.load_version().compute_hash(),
- "image": (settings.BASE_DIR / "fixtures" / "logo.png").open("rb"),
- },
+ reverse("content:edit-title", args=[article.pk]),
+ {"title": "title"},
follow=True,
)
self.assertEqual(200, result.status_code)
diff --git a/zds/tutorialv2/tests/tests_views/tests_editsubtitle.py b/zds/tutorialv2/tests/tests_views/tests_editsubtitle.py
new file mode 100644
index 0000000000..a287d8b2d1
--- /dev/null
+++ b/zds/tutorialv2/tests/tests_views/tests_editsubtitle.py
@@ -0,0 +1,137 @@
+from datetime import datetime
+
+from django.test import TestCase
+from django.urls import reverse
+from django.utils.html import escape
+from django.utils.translation import gettext_lazy as _
+
+from zds.tutorialv2.models.database import PublishableContent
+from zds.tutorialv2.views.contents import EditSubtitle, EditSubtitleForm
+from zds.tutorialv2.tests import TutorialTestMixin, override_for_contents
+from zds.tutorialv2.tests.factories import PublishableContentFactory
+from zds.member.tests.factories import ProfileFactory, StaffProfileFactory
+
+
+viewname = "content:edit-subtitle"
+
+
+@override_for_contents()
+class PermissionTests(TutorialTestMixin, TestCase):
+ """Test permissions and associated behaviors, such as redirections and status codes."""
+
+ def setUp(self):
+ # Create users
+ self.author = ProfileFactory().user
+ self.staff = StaffProfileFactory().user
+ self.outsider = ProfileFactory().user
+
+ # Create a content
+ self.content = PublishableContentFactory(author_list=[self.author])
+
+ # Get information to be reused in tests
+ self.form_url = reverse(viewname, kwargs={"pk": self.content.pk})
+ self.form_data = {"subtitle": self.content.description} # exact value is not important
+ self.content_data = {"pk": self.content.pk, "slug": self.content.slug}
+ self.content_url = reverse("content:view", kwargs=self.content_data)
+ self.login_url = reverse("member-login") + "?next=" + self.form_url
+
+ def test_not_authenticated(self):
+ """Test that on form submission, unauthenticated users are redirected to the login page."""
+ self.client.logout() # ensure no user is authenticated
+ response = self.client.post(self.form_url, self.form_data)
+ self.assertRedirects(response, self.login_url)
+
+ def test_authenticated_author(self):
+ """Test that on form submission, authors are redirected to the content page."""
+ self.client.force_login(self.author)
+ response = self.client.post(self.form_url, self.form_data)
+ self.assertRedirects(response, self.content_url)
+
+ def test_authenticated_staff(self):
+ """Test that on form submission, staffs are redirected to the content page."""
+ self.client.force_login(self.staff)
+ response = self.client.post(self.form_url, self.form_data)
+ self.assertRedirects(response, self.content_url)
+
+ def test_authenticated_outsider(self):
+ """Test that on form submission, unauthorized users get a 403."""
+ self.client.force_login(self.outsider)
+ response = self.client.post(self.form_url, self.form_data)
+ self.assertEqual(response.status_code, 403)
+
+
+@override_for_contents()
+class WorkflowTests(TutorialTestMixin, TestCase):
+ """Test the workflow of the form, such as validity errors and success messages."""
+
+ def setUp(self):
+ # Create a user
+ self.author = ProfileFactory()
+
+ # Create a content
+ self.content = PublishableContentFactory(author_list=[self.author.user])
+
+ # Get information to be reused in tests
+ self.form_url = reverse(viewname, kwargs={"pk": self.content.pk})
+ self.error_messages = EditSubtitleForm.declared_fields["subtitle"].error_messages
+ self.success_message = EditSubtitle.success_message
+
+ # Log in with an authorized user (e.g the author of the content)
+ self.client.force_login(self.author.user)
+
+ def get_test_cases(self):
+ max_length = PublishableContent._meta.get_field("description").max_length
+ too_long = "a" * (max_length + 1)
+ return {
+ "empty_form": {"inputs": {}, "expected_outputs": [self.success_message]},
+ "empty_fields": {"inputs": {"subtitle": ""}, "expected_outputs": [self.success_message]},
+ "basic_success": {"inputs": {"subtitle": "Sous-titre"}, "expected_outputs": [self.success_message]},
+ "stripped_to_empty": {"inputs": {"subtitle": " "}, "expected_outputs": [self.success_message]},
+ "too_long": {
+ "inputs": {"subtitle": too_long},
+ "expected_outputs": [_("Assurez-vous que cette valeur comporte au plus")],
+ },
+ }
+
+ def test_form_workflow(self):
+ test_cases = self.get_test_cases()
+ for case_name, case in test_cases.items():
+ with self.subTest(msg=case_name):
+ response = self.client.post(self.form_url, case["inputs"], follow=True)
+ for msg in case["expected_outputs"]:
+ self.assertContains(response, escape(msg))
+
+
+@override_for_contents()
+class FunctionalTests(TutorialTestMixin, TestCase):
+ """Test the detailed behavior of the feature, such as updates of the database or repositories."""
+
+ def setUp(self):
+ self.author = ProfileFactory()
+ self.content = PublishableContentFactory(author_list=[self.author.user])
+ self.form_url = reverse(viewname, kwargs={"pk": self.content.pk})
+ self.client.force_login(self.author.user)
+
+ def test_normal(self):
+ start_date = datetime.now()
+ self.assertTrue(self.content.update_date < start_date)
+
+ new_subtitle = "Ceci n'est pas un ancien sous-titre"
+ response = self.client.post(self.form_url, {"subtitle": new_subtitle}, follow=True)
+ self.assertEqual(response.status_code, 200)
+
+ self.content.refresh_from_db()
+
+ self.assertEqual(self.content.description, new_subtitle)
+ self.assertTrue(self.content.update_date > start_date)
+
+ # Update in repository
+ versioned_content = self.content.load_version()
+ self.assertEqual(self.content.description, versioned_content.description)
+
+ def test_empty(self):
+ empty_subtitle = ""
+ response = self.client.post(self.form_url, {"subtitle": empty_subtitle}, follow=True)
+ self.assertEqual(response.status_code, 200)
+ self.content.refresh_from_db()
+ self.assertEqual(self.content.description, empty_subtitle)
diff --git a/zds/tutorialv2/tests/tests_views/tests_edittitle.py b/zds/tutorialv2/tests/tests_views/tests_edittitle.py
new file mode 100644
index 0000000000..10b38e586f
--- /dev/null
+++ b/zds/tutorialv2/tests/tests_views/tests_edittitle.py
@@ -0,0 +1,148 @@
+from datetime import datetime
+
+from django.test import TestCase
+from django.urls import reverse
+from django.utils.html import escape
+from django.utils.translation import gettext_lazy as _
+
+from zds.tutorialv2.models.database import PublishableContent
+from zds.tutorialv2.views.contents import EditTitleForm, EditTitle
+from zds.tutorialv2.tests import TutorialTestMixin, override_for_contents
+from zds.tutorialv2.tests.factories import PublishableContentFactory
+from zds.member.tests.factories import ProfileFactory, StaffProfileFactory
+
+
+@override_for_contents()
+class PermissionTests(TutorialTestMixin, TestCase):
+ """Test permissions and associated behaviors, such as redirections and status codes."""
+
+ def setUp(self):
+ # Create users
+ self.author = ProfileFactory().user
+ self.staff = StaffProfileFactory().user
+ self.outsider = ProfileFactory().user
+
+ # Create a content
+ self.content = PublishableContentFactory(author_list=[self.author])
+
+ # Get information to be reused in tests
+ self.form_url = reverse("content:edit-title", kwargs={"pk": self.content.pk})
+ self.form_data = {"title": self.content.title} # avoids changing the slug
+ self.content_data = {"pk": self.content.pk, "slug": self.content.slug}
+ self.content_url = reverse("content:view", kwargs=self.content_data)
+ self.login_url = reverse("member-login") + "?next=" + self.form_url
+
+ def test_not_authenticated(self):
+ """Test that on form submission, unauthenticated users are redirected to the login page."""
+ self.client.logout() # ensure no user is authenticated
+ response = self.client.post(self.form_url, self.form_data)
+ self.assertRedirects(response, self.login_url)
+
+ def test_authenticated_author(self):
+ """Test that on form submission, authors are redirected to the content page."""
+ self.client.force_login(self.author)
+ response = self.client.post(self.form_url, self.form_data)
+ self.assertRedirects(response, self.content_url)
+
+ def test_authenticated_staff(self):
+ """Test that on form submission, staffs are redirected to the content page."""
+ self.client.force_login(self.staff)
+ response = self.client.post(self.form_url, self.form_data)
+ self.assertRedirects(response, self.content_url)
+
+ def test_authenticated_outsider(self):
+ """Test that on form submission, unauthorized users get a 403."""
+ self.client.force_login(self.outsider)
+ response = self.client.post(self.form_url, self.form_data)
+ self.assertEqual(response.status_code, 403)
+
+
+@override_for_contents()
+class WorkflowTests(TutorialTestMixin, TestCase):
+ """Test the workflow of the form, such as validity errors and success messages."""
+
+ def setUp(self):
+ # Create a user
+ self.author = ProfileFactory()
+
+ # Create a content
+ self.content = PublishableContentFactory(author_list=[self.author.user])
+
+ # Get information to be reused in tests
+ self.form_url = reverse("content:edit-title", kwargs={"pk": self.content.pk})
+ self.error_messages = EditTitleForm.declared_fields["title"].error_messages
+ self.success_message = EditTitle.success_message
+
+ # Log in with an authorized user (e.g the author of the content)
+ self.client.force_login(self.author.user)
+
+ def get_test_cases(self):
+ special_char_for_slug = "/"
+ max_length = PublishableContent._meta.get_field("title").max_length
+ too_long = "a" * (max_length + 1)
+ return {
+ "empty_form": {"inputs": {}, "expected_outputs": [self.success_message]},
+ "empty_fields": {"inputs": {"title": ""}, "expected_outputs": [self.success_message]},
+ "basic_success": {"inputs": {"title": "Titre"}, "expected_outputs": [self.success_message]},
+ "stripped_to_empty": {"inputs": {"title": " "}, "expected_outputs": [self.success_message]},
+ "too_long": {
+ "inputs": {"title": too_long},
+ "expected_outputs": [_("Assurez-vous que cette valeur comporte au plus")],
+ },
+ "invalid_slug": {
+ "inputs": {"title": special_char_for_slug},
+ "expected_outputs": [EditTitleForm.error_messages["bad_slug"].format(special_char_for_slug)],
+ },
+ }
+
+ def test_form_workflow(self):
+ test_cases = self.get_test_cases()
+ for case_name, case in test_cases.items():
+ with self.subTest(msg=case_name):
+ response = self.client.post(self.form_url, case["inputs"], follow=True)
+ for msg in case["expected_outputs"]:
+ self.assertContains(response, escape(msg))
+
+
+@override_for_contents()
+class FunctionalTests(TutorialTestMixin, TestCase):
+ """Test the detailed behavior of the feature, such as updates of the database or repositories."""
+
+ def setUp(self):
+ self.author = ProfileFactory()
+ self.content = PublishableContentFactory(author_list=[self.author.user])
+ self.form_url = reverse("content:edit-title", kwargs={"pk": self.content.pk})
+ self.client.force_login(self.author.user)
+
+ def test_normal(self):
+ self.assertEqual(self.content.title, self.content.gallery.title)
+ start_date = datetime.now()
+ self.assertTrue(self.content.update_date < start_date)
+
+ new_title = "Ceci n'est pas un ancien titre"
+ response = self.client.post(self.form_url, {"title": new_title}, follow=True)
+ self.assertEqual(response.status_code, 200)
+
+ self.content.refresh_from_db()
+
+ self.assertEqual(self.content.title, new_title)
+ self.assertTrue(self.content.update_date > start_date)
+ self.assertEqual(self.content.title, self.content.gallery.title)
+
+ # Update in repository
+ versioned_content = self.content.load_version()
+ self.assertEqual(self.content.title, versioned_content.title)
+
+ # Reachable with new slug
+ response = self.client.get(reverse("content:view", kwargs={"pk": self.content.pk, "slug": self.content.slug}))
+ self.assertEqual(response.status_code, 200)
+
+ def test_empty(self):
+ empty_title = ""
+ default_when_empty = "Titre par défaut"
+ response = self.client.post(self.form_url, {"title": empty_title}, follow=True)
+
+ self.assertEqual(response.status_code, 200)
+
+ self.content.refresh_from_db()
+ self.assertEqual(self.content.title, default_when_empty)
diff --git a/zds/tutorialv2/tests/tests_views/tests_published.py b/zds/tutorialv2/tests/tests_views/tests_published.py
index 2512270b15..e002423892 100644
--- a/zds/tutorialv2/tests/tests_views/tests_published.py
+++ b/zds/tutorialv2/tests/tests_views/tests_published.py
@@ -1188,21 +1188,10 @@ def test_republish_with_different_slug(self):
# change title
tuto = PublishableContent.objects.get(pk=self.tuto.pk)
old_slug = tuto.slug
- random = "Whatever, we don't care about the details"
result = self.client.post(
- reverse("content:edit", args=[tuto.pk, tuto.slug]),
- {
- "title": "{} ({})".format(self.tuto.title, "modified"), # will change slug
- "description": random,
- "introduction": random,
- "conclusion": random,
- "type": "TUTORIAL",
- "licence": self.tuto.licence.pk,
- "subcategory": self.subcategory.pk,
- "last_hash": tuto.load_version().compute_hash(),
- "image": (settings.BASE_DIR / "fixtures" / "logo.png").open("rb"),
- },
+ reverse("content:edit-title", args=[tuto.pk]),
+ {"title": "{self.tuto.title} (modified)"}, # will change the slug
follow=False,
)
self.assertEqual(result.status_code, 302)
diff --git a/zds/tutorialv2/urls/urls_contents.py b/zds/tutorialv2/urls/urls_contents.py
index 2cd1f7ba9d..ef7e9eaa86 100644
--- a/zds/tutorialv2/urls/urls_contents.py
+++ b/zds/tutorialv2/urls/urls_contents.py
@@ -1,13 +1,19 @@
from django.urls import path
from django.views.generic.base import RedirectView
-from zds.tutorialv2.views.contents import CreateContent, EditContent, DeleteContent
-from zds.tutorialv2.views.licence import EditContentLicense
+from zds.tutorialv2.views.contents import (
+ CreateContent,
+ EditContent,
+ DeleteContent,
+ EditTitle,
+ EditSubtitle,
+)
from zds.tutorialv2.views.display.container import ContainerValidationView
from zds.tutorialv2.views.display.content import ContentValidationView
from zds.tutorialv2.views.events import EventsList
from zds.tutorialv2.views.goals import EditGoals, MassEditGoals, ViewContentsByGoal
from zds.tutorialv2.views.labels import EditLabels, ViewContentsByLabel
+from zds.tutorialv2.views.licence import EditContentLicense
from zds.tutorialv2.views.validations_contents import ActivateJSFiddleInContent
from zds.tutorialv2.views.containers_extracts import (
CreateContainer,
@@ -207,6 +213,9 @@ def get_version_pages():
path("enlever-contributeur/
/", RemoveContributorFromContent.as_view(), name="remove-contributor"),
path("ajouter-auteur//", AddAuthorToContent.as_view(), name="add-author"),
path("enlever-auteur//", RemoveAuthorFromContent.as_view(), name="remove-author"),
+ # Modify the title and subtitle
+ path("modifier-titre//", EditTitle.as_view(), name="edit-title"),
+ path("modifier-sous-titre//", EditSubtitle.as_view(), name="edit-subtitle"),
# Modify the license
path("modifier-licence//", EditContentLicense.as_view(), name="edit-license"),
# Modify the tags
diff --git a/zds/tutorialv2/views/contents.py b/zds/tutorialv2/views/contents.py
index e3289eb7e8..d6f21b48d4 100644
--- a/zds/tutorialv2/views/contents.py
+++ b/zds/tutorialv2/views/contents.py
@@ -1,10 +1,14 @@
import logging
from datetime import datetime
+from crispy_forms.bootstrap import StrictButton
+from crispy_forms.helper import FormHelper
+from crispy_forms.layout import Layout, Field
from django.conf import settings
from django.contrib import messages
from django.contrib.auth.mixins import LoginRequiredMixin
from django.db import transaction
+from django.forms import forms, CharField
from django.shortcuts import redirect
from django.template.loader import render_to_string
from django.urls import reverse
@@ -18,6 +22,8 @@
from zds.member.utils import get_bot_account
from zds.tutorialv2.forms import (
ContentForm,
+ FormWithTitle,
+ EditContentForm,
)
from zds.tutorialv2.mixins import (
SingleContentFormViewMixin,
@@ -35,15 +41,6 @@
logger = logging.getLogger(__name__)
-def create_content_gallery(form):
- gal = Gallery()
- gal.title = form.cleaned_data["title"]
- gal.slug = slugify(form.cleaned_data["title"])
- gal.pubdate = datetime.now()
- gal.save()
- return gal
-
-
class CreateContent(LoggedWithReadWriteHability, FormWithPreview):
"""
Handle content creation. Since v22 a licence must be explicitly selected
@@ -81,20 +78,23 @@ def form_valid(self, form):
self.content.source = form.cleaned_data["source"]
self.content.creation_date = datetime.now()
- # Creating the gallery
- gal = create_content_gallery(form)
+ gallery = Gallery.objects.create(
+ title=self.content.title,
+ slug=slugify(self.content.title),
+ pubdate=datetime.now(),
+ )
# create image:
if "image" in self.request.FILES:
mixin = ImageCreateMixin()
- mixin.gallery = gal
+ mixin.gallery = gallery
try:
img = mixin.perform_create(str(_("Icône du contenu")), self.request.FILES["image"])
except NotAnImage:
form.add_error("image", _("Image invalide"))
return super().form_invalid(form)
img.pubdate = datetime.now()
- self.content.gallery = gal
+ self.content.gallery = gallery
self.content.save()
if "image" in self.request.FILES:
self.content.image = img
@@ -128,16 +128,13 @@ def get_success_url(self):
class EditContent(LoggedWithReadWriteHability, SingleContentFormViewMixin, FormWithPreview):
template_name = "tutorialv2/edit/content.html"
model = PublishableContent
- form_class = ContentForm
+ form_class = EditContentForm
def get_initial(self):
"""rewrite function to pre-populate form"""
initial = super().get_initial()
versioned = self.versioned_object
- initial["title"] = versioned.title
- initial["description"] = versioned.description
- initial["type"] = versioned.type
initial["introduction"] = versioned.get_introduction()
initial["conclusion"] = versioned.get_conclusion()
initial["source"] = versioned.source
@@ -176,23 +173,20 @@ def form_valid(self, form):
return self.form_invalid(form)
# first, update DB (in order to get a new slug if needed)
- title_is_changed = publishable.title != form.cleaned_data["title"]
- publishable.title = form.cleaned_data["title"]
- publishable.description = form.cleaned_data["description"]
publishable.source = form.cleaned_data["source"]
publishable.update_date = datetime.now()
- # update gallery and image:
- gal = Gallery.objects.filter(pk=publishable.gallery.pk)
- gal.update(title=publishable.title)
- gal.update(slug=slugify(publishable.title))
- gal.update(update=datetime.now())
-
+ # update image
if "image" in self.request.FILES:
+ gallery_defaults = {
+ "title": publishable.title,
+ "slug": slugify(publishable.title),
+ "pubdate": datetime.now(),
+ }
+ gallery, _created = Gallery.objects.get_or_create(pk=publishable.gallery.pk, defaults=gallery_defaults)
mixin = ImageCreateMixin()
- # use .first because we need an instance of Gallery, not a queryset
- mixin.gallery = gal.first() or create_content_gallery(form)
+ mixin.gallery = gallery
try:
img = mixin.perform_create(str(_("Icône du contenu")), self.request.FILES["image"])
except NotAnImage:
@@ -201,19 +195,17 @@ def form_valid(self, form):
img.pubdate = datetime.now()
publishable.image = img
- publishable.save(force_slug_update=title_is_changed)
- logger.debug("content %s updated, slug is %s", publishable.pk, publishable.slug)
- # now, update the versioned information
- versioned.description = form.cleaned_data["description"]
+ publishable.save()
+ # now, update the versioned information
sha = versioned.repo_update_top_container(
- form.cleaned_data["title"],
+ publishable.title,
publishable.slug,
form.cleaned_data["introduction"],
form.cleaned_data["conclusion"],
form.cleaned_data["msg_commit"],
)
- logger.debug("slug consistency after repo update repo=%s db=%s", versioned.slug, publishable.slug)
+
# update relationships :
publishable.sha_draft = sha
@@ -227,6 +219,162 @@ def form_valid(self, form):
return super().form_valid(form)
+class EditTitleForm(FormWithTitle):
+ def __init__(self, versioned_content, *args, **kwargs):
+ kwargs["initial"] = {"title": versioned_content.title}
+ super().__init__(*args, **kwargs)
+
+ self.helper = FormHelper()
+ self.helper.form_class = "content-wrapper"
+ self.helper.form_method = "post"
+ self.helper.form_id = "edit-title"
+ self.helper.form_class = "modal modal-flex"
+ self.helper.form_action = reverse("content:edit-title", kwargs={"pk": versioned_content.pk})
+ self.helper.layout = Layout(
+ Field("title"),
+ StrictButton("Modifier", type="submit"),
+ )
+ self.previous_page_url = reverse(
+ "content:view", kwargs={"pk": versioned_content.pk, "slug": versioned_content.slug}
+ )
+
+
+class EditTitle(LoginRequiredMixin, SingleContentFormViewMixin):
+ modal_form = True
+ model = PublishableContent
+ form_class = EditTitleForm
+ success_message = _("Le titre de la publication a bien été changé.")
+
+ def get_form_kwargs(self):
+ kwargs = super().get_form_kwargs()
+ kwargs["versioned_content"] = self.versioned_object
+ return kwargs
+
+ def form_valid(self, form):
+ publishable = self.object
+ versioned = self.versioned_object
+ title = form.cleaned_data["title"]
+
+ self.update_title_in_database(publishable, title)
+ logger.debug("content %s updated, slug is %s", publishable.pk, publishable.slug)
+
+ sha = self.update_title_in_repository(publishable, versioned, title)
+ logger.debug("slug consistency after repo update repo=%s db=%s", versioned.slug, publishable.slug)
+
+ self.update_gallery(publishable)
+ self.update_sha_draft(publishable, sha)
+
+ messages.success(self.request, self.success_message)
+
+ # A title update usually also changes the slug
+ form.previous_page_url = reverse("content:view", kwargs={"pk": versioned.pk, "slug": versioned.slug})
+
+ return redirect(form.previous_page_url)
+
+ @staticmethod
+ def update_title_in_database(publishable_content, title):
+ title_has_changed = publishable_content.title != title
+ publishable_content.title = title
+ publishable_content.save(force_slug_update=title_has_changed, force_update=True)
+
+ @staticmethod
+ def update_title_in_repository(publishable_content, versioned_content, title):
+ versioned_content.title = title
+ sha = versioned_content.repo_update_top_container(
+ publishable_content.title,
+ publishable_content.slug,
+ versioned_content.get_introduction(),
+ versioned_content.get_conclusion(),
+ f"Nouveau titre ({title})",
+ )
+ return sha
+
+ @staticmethod
+ def update_sha_draft(publishable_content, sha):
+ publishable_content.sha_draft = sha
+ publishable_content.save()
+
+ @staticmethod
+ def update_gallery(publishable_content):
+ gallery = Gallery.objects.filter(pk=publishable_content.gallery.pk).first()
+ gallery.title = publishable_content.title
+ gallery.slug = slugify(publishable_content.title)
+ gallery.update = datetime.now()
+ gallery.save()
+
+
+class EditSubtitleForm(forms.Form):
+ subtitle = CharField(
+ label=_("Sous-titre"),
+ max_length=PublishableContent._meta.get_field("description").max_length,
+ required=False,
+ )
+
+ def __init__(self, versioned_content, *args, **kwargs):
+ kwargs["initial"] = {"subtitle": versioned_content.description}
+ super().__init__(*args, **kwargs)
+
+ self.helper = FormHelper()
+ self.helper.form_class = "content-wrapper"
+ self.helper.form_method = "post"
+ self.helper.form_id = "edit-subtitle"
+ self.helper.form_class = "modal modal-flex"
+ self.helper.form_action = reverse("content:edit-subtitle", kwargs={"pk": versioned_content.pk})
+ self.helper.layout = Layout(
+ Field("subtitle"),
+ StrictButton("Modifier", type="submit"),
+ )
+ self.previous_page_url = reverse(
+ "content:view", kwargs={"pk": versioned_content.pk, "slug": versioned_content.slug}
+ )
+
+
+class EditSubtitle(LoginRequiredMixin, SingleContentFormViewMixin):
+ modal_form = True
+ model = PublishableContent
+ form_class = EditSubtitleForm
+ success_message = _("Le sous-titre de la publication a bien été changé.")
+
+ def get_form_kwargs(self):
+ kwargs = super().get_form_kwargs()
+ kwargs["versioned_content"] = self.versioned_object
+ return kwargs
+
+ def form_valid(self, form):
+ publishable = self.object
+ versioned = self.versioned_object
+
+ self.update_subtitle_in_database(publishable, form.cleaned_data["subtitle"])
+ sha = self.update_subtitle_in_repository(publishable, versioned, form.cleaned_data["subtitle"])
+ self.update_sha_draft(publishable, sha)
+
+ messages.success(self.request, self.success_message)
+
+ return redirect(form.previous_page_url)
+
+ @staticmethod
+ def update_subtitle_in_database(publishable_content, subtitle):
+ publishable_content.description = subtitle
+ publishable_content.save(force_update=True)
+
+ @staticmethod
+ def update_subtitle_in_repository(publishable_content, versioned_content, subtitle):
+ versioned_content.description = subtitle
+ sha = versioned_content.repo_update_top_container(
+ publishable_content.title,
+ publishable_content.slug,
+ versioned_content.get_introduction(),
+ versioned_content.get_conclusion(),
+ f"Nouveau sous-titre ({subtitle})",
+ )
+ return sha
+
+ @staticmethod
+ def update_sha_draft(publishable_content, sha):
+ publishable_content.sha_draft = sha
+ publishable_content.save()
+
+
class DeleteContent(LoginRequiredMixin, SingleContentViewMixin, DeleteView):
model = PublishableContent
http_method_names = ["post"]
diff --git a/zds/tutorialv2/views/display/config.py b/zds/tutorialv2/views/display/config.py
index 085da2fe31..6ce2e8d7d3 100644
--- a/zds/tutorialv2/views/display/config.py
+++ b/zds/tutorialv2/views/display/config.py
@@ -164,6 +164,9 @@ def show_draft_link(self) -> bool:
def show_license_edit(self) -> bool:
return self.enabled and self.is_allowed and not self.is_container
+ def show_title_edit(self) -> bool:
+ return self.enabled and self.is_allowed and not self.is_container
+
def show_authors_management(self) -> bool:
return self.enabled and self.is_allowed
diff --git a/zds/tutorialv2/views/display/content.py b/zds/tutorialv2/views/display/content.py
index be89dea196..bbe78d1f06 100644
--- a/zds/tutorialv2/views/display/content.py
+++ b/zds/tutorialv2/views/display/content.py
@@ -38,6 +38,7 @@
ContentReaction,
)
from zds.tutorialv2.utils import last_participation_is_old, mark_read
+from zds.tutorialv2.views.contents import EditTitleForm, EditSubtitleForm
from zds.tutorialv2.views.display.config import (
ConfigForContentDraftView,
ConfigForVersionView,
@@ -88,6 +89,7 @@ def get_context_data(self, **kwargs):
context["form_warn_typo"] = WarnTypoForm(versioned, versioned, public=False)
context["form_jsfiddle"] = JsFiddleActivationForm(initial={"js_support": self.object.js_support})
context["form_edit_license"] = EditContentLicenseForm(versioned)
+
context["form_publication"] = PublicationForm(versioned, initial={"source": self.object.source})
context["gallery"] = self.object.gallery
context["alerts"] = self.object.alerts_on_this_content.all()
@@ -135,6 +137,8 @@ class ContentDraftView(LoginRequiredMixin, ContentBaseView):
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
+ context["form_edit_title"] = EditTitleForm(self.versioned_object)
+ context["form_edit_subtitle"] = EditSubtitleForm(self.versioned_object)
context["display_config"] = ConfigForContentDraftView(self.request.user, self.object, self.versioned_object)
return context
- {% endif %}
- {{ title }}
-