diff --git a/doc/source/back-end/contents.rst b/doc/source/back-end/contents.rst index c07305adc3..3398d69226 100644 --- a/doc/source/back-end/contents.rst +++ b/doc/source/back-end/contents.rst @@ -1,6 +1,6 @@ -======================================= -Les tutoriels et articles v2.0 (ZEP 12) -======================================= +========================= +Les tutoriels et articles +========================= Vocabulaire et définitions ========================== @@ -154,6 +154,12 @@ stocker (détails plus bas). Dès lors, cette spécification **impose** que ce *slug* soit unique au sein du conteneur parent, et que le *slug* du contenu soit unique au sein de tous les contenus de ZdS. +La taille des *slugs* ne peut dépasser une certaine limite, définie dans le code par +``ZDS_APP['content']['maximum_slug_size']`` (par défaut 150). Cette limite est due à +une contrainte sur la taille maximum d'un nom de fichier sur les différents systèmes +(généralement 255 octets sur la plupart des systèmes de fichier modernes, voir à ce sujet +`l'article Wikipedia correspondant (en) `_). + .. note:: À noter que l'*underscore* est conservé par compatibilité avec l'ancien diff --git a/doc/source/back-end/contents_manifest.rst b/doc/source/back-end/contents_manifest.rst index 76b34fa981..7b375a5000 100644 --- a/doc/source/back-end/contents_manifest.rst +++ b/doc/source/back-end/contents_manifest.rst @@ -31,15 +31,80 @@ Plus précisément : Sauf cas exceptionnel, la numérotation de X commence à 1, la numérotation de Y commence à 0, la numérotation de Z commence à 0. -La version du manifeste est donnée par le champ éponyme situé à la racine du manifeste ( ```{ version="2.0.0"}```). -L'absence du champ version est interprétée comme ``̀{version="1.0.0"}```. -Les 0 non significatifs sont optionnels ainsi ```{version="1"}``` est strictement équivalent à ```{version:"1.0"}``` lui-même strictement équivalent à ```{version:"1.0.0"}```. +La version du manifeste est donnée par le champ éponyme situé à la racine du manifeste ( ``{ version: "2.0.0"}``). +L'absence du champ version est interprétée comme ``{version: "1.0"}``. +Les 0 non significatifs sont optionnels ainsi ``{version: "1"}`` est strictement équivalent à ``{version: "1.0"}`` lui-même strictement équivalent à ``{version: "1.0.0"}``. + +Version 2.0 +----------- + +La version 2.0 est la version actuelement utilisée. + +.. sourcecode:: json + + { + "object": "container", + "slug": "un-tutoriel", + "title": "Un tutoriel", + "introduction": "introduction.md", + "conclusion": "conclusion.md", + "version": 2, + "description": "Une description", + "type": "TUTORIAL", + "licence": "Beerware", + "children": [ + { + "object": "container", + "slug": "titre-de-mon-chapitre", + "title": "Titre de mon chapitre", + "introduction": "titre-de-mon-chapitre/introduction.md", + "conclusion": "titre-de-mon-chapitre/conclusion.md", + "children": [ + { + "object": "extract", + "slug": "titre-de-mon-extrait", + "title": "Titre de mon extrait", + "text": "titre-de-mon-chapitre/titre-de-mon-extrait.md" + }, + (...) + ] + }, + (...) + ] + } + +1. ``type`` : Le type de contenu, vaut "TUTORIAL" ou "ARTICLE". *Si ce champ est absent ou invalide, le type vaudra par défaut "TUTORIAL".* +2. ``description`` : La description du contenu. Est affichée comme sous-titre dans la page finale. **Obligatoire** +3. ``title`` : Le titre du contenu. **Obligatoire** +4. ``slug`` : slug du contenu qui permet de faire une url SEO-friendly. Pour rappel, `certaines contraintes doivent être respectées dans le choix du slug `_. **Obligatoire**. ATENTION : si ce slug existe déjà dans notre base de données, il est possible qu'un nombre lui soit ajouté +5. ``introduction`` : le nom du fichier Mardown qui possède l'introduction. Il doit pointer vers le dossier courant. *Optionnel mais conseillé* +6. ``conclusion`` : le nom du fichier Mardown qui possède la conclusion. Il doit pointer vers le dossier courant. *Optionnel mais conseillé* +7. ``licence`` : nom complet de la license. *A priori* les licences "CC" et "Tous drois réservés" sont supportées. Le support de toute autre licence dépendra du site utilisant le code de ZdS (fork) que vous visez. **Obligatoire** +8. ``children`` : tableau contenant l'architecture du contenu. + 1. ``object`` : type d'enfant (*container* ou *extract*, selon qu'il s'agisse d'une section ou d'un texte). **Obligatoire** + 2. ``title`` : le titre de l'enfant. **Obligatoire** + 3. ``slug`` : le slug de l'enfant pour créer une url SEO-friendly, doit être unique dans le contenu, le slug est utilisé pour trouver le chemin vers l'enfant dans le système de fichier si c'est une section. Attention, `certaines contraintes doivent être respectées dans le choix du slug `_. **Obligatoire** + 4. ``introduction`` : nom du fichier contenant l'introduction quand l'enfant est de type *container*. *Optionnel mais conseillé* + 5. ``conclusion`` : nom du fichier contenant la conclusion quand l'enfant est de type *container*. *Optionnel mais conseillé* + 6. ``children`` : tableau vers les enfants de niveau inférieur si l'enfant est de type *container*. **Obligatoire** + 7. ``text`` : nom du fichier contenant le texte quand l'enfant est de type *extract*. Nous conseillons de garder la convention ``nom de fichier = slug.md`` mais rien n'est obligatoire à ce sujet. **Obligatoire** + + + Version 1.0 ----------- + +.. note:: + + La version 1.0 est dépréciée, et il est conseillé d'employer la version 2.0. Il est ceci dit toujours possible + `d'importer des contenus `_ dont le manifeste est toujours en version 1.0, mais à vos risques et périls. + + La version 1.0 définit trois types de manifeste selon que nous faisons face à un article, un mini tutoriel ou un big tutoriel. + MINI TUTO +++++++++ @@ -106,56 +171,3 @@ Article "type": "article", "text": "text.md" } - - -Version 2.0 ------------ - -.. sourcecode:: json - - { - "object": "container", - "slug": "un-tutoriel", - "title": "Un tutoriel", - "introduction": "introduction.md", - "conclusion": "conclusion.md", - "version": 2, - "description": "Une description", - "type": "TUTORIAL", - "licence": "Beerware", - "children": [ - { - "object": "container", - "slug": "titre-de-mon-chapitre", - "title": "Titre de mon chapitre", - "introduction": "titre-de-mon-chapitre/introduction.md", - "conclusion": "titre-de-mon-chapitre/conclusion.md", - "children": [ - { - "object": "extract", - "slug": "titre-de-mon-extrait", - "title": "Titre de mon extrait", - "text": "titre-de-mon-chapitre/titre-de-mon-extrait.md" - }, - (...) - ] - }, - (...) - ] - } - -1. ``type`` : Le type de contenu, vaut "TUTORIAL" ou "ARTICLE". **Obligatoire** -2. ``description`` : La description du contenu. Est affichée comme sous-titre dans la page finale. **Obligatoire** -3. ``title`` : Le titre du contenu. **Obligatoire** -4. ``slug`` : slug du contenu qui permet de faire une url SEO-friendly. **Obligatoire**. ATENTION : si ce slug existe déjà dans notre base de données, il est possible qu'un nombre lui soit ajouté -5. ``introduction`` : le nom du fichier Mardown qui possède l'introduction. Il doit pointer vers le dossier courant. *Optionnel mais conseillé* -6. ``conclusion`` : le nom du fichier Mardown qui possède la conclusion. Il doit pointer vers le dossier courant. *Optionnel mais conseillé* -7. ``licence`` : nom complet de la license. *A priori* les licences "CC" et "Tous drois réservés" sont supportées. Le support de toute autre licence dépendra du site utilisant le code de ZdS (fork) que vous visez. **Obligatoire** -8. ``children`` : tableau contenant l'architecture du contenu. **Obligatoire** - 1. ``object`` : type d'enfant (*container* ou *extract*, selon qu'il s'agisse d'une section ou d'un texte). **Obligatoire** - 2. ``title`` : le titre de l'enfant. **Obligatoire** - 3. ``slug`` : le slug de l'enfant pour créer une url SEO-friendly, doit être unique dans le contenu, le slug est utilisé pour trouver le chemin vers l'enfant dans le système de fichier si c'est une section. **obligatoire** - 4. ``introduction`` : nom du fichier contenant l'introduction quand l'enfant est de type *container*. *Optionnel mais conseillé* - 5. ``conclusion`` : nom du fichier contenant la conclusion quand l'enfant est de type *container*. *Optionnel mais conseillé* - 6. ``children`` : tableau vers les enfants de niveau inférieur si l'enfant est de type *container*. **Obligatoire** - 7. ``text`` : nom du fichier contenant le texte quand l'enfant est de type *extract*. Nous conseillons de garder la convention ``nom de fichier = slug.md`` mais rien n'est obligatoire à ce sujet. **Obligatoire** diff --git a/doc/source/install/backend-linux-install.rst b/doc/source/install/backend-linux-install.rst index aca0ef7a93..5ef2be01f9 100644 --- a/doc/source/install/backend-linux-install.rst +++ b/doc/source/install/backend-linux-install.rst @@ -25,13 +25,13 @@ Assurez vous que les dépendances suivantes soient résolues : - libz-dev (peut être libz1g-dev sur système 64bits) - python-sqlparse - libffi : ``apt-get install libffi-dev`` -- libjpeg8 libjpeg8-dev libfreetype6 libfreetype6-dev : ``apt-get install libjpeg8 libjpeg8-dev libfreetype6 libfreetype6-dev`` +- libjpeg62-turbo libjpeg62-turbo-dev libfreetype6 libfreetype6-dev : ``apt-get install libjpeg62-turbo libjpeg62-turbo-dev libfreetype6 libfreetype6-dev`` Ou, en une ligne, .. sourcecode:: bash - apt-get install git python-dev python-setuptools '^geoip(-bin)?$' libgeoip-dev libxml2-dev python-lxml libxslt-dev libz-dev python-sqlparse libjpeg8 libjpeg8-dev libfreetype6 libfreetype6-dev libffi-dev + apt-get install git python-dev python-setuptools '^geoip(-bin)?$' libgeoip-dev libxml2-dev python-lxml libxslt-dev libz-dev python-sqlparse libjpeg62-turbo libjpeg62-turbo-dev libfreetype6 libfreetype6-dev libffi-dev easy_install pip tox Installation et configuration de `virtualenv` diff --git a/requirements.txt b/requirements.txt index 84c7e03ed9..623ffcd24a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,7 +14,7 @@ python-memcached==1.54 lxml==3.4.4 factory-boy==2.4.1 pygeoip==0.3.2 -pillow==2.8.1 +pillow==2.9.0 gitpython==1.0.1 https://github.com/zestedesavoir/Python-ZMarkdown/archive/2.6.0-zds.7.zip easy-thumbnails==2.2 diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 7bf1dcde86..a2b8388bb4 100755 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -49,7 +49,7 @@ git checkout -b $1 # Update application data source ../bin/activate -pip install --upgrade --use-mirrors -r requirements.txt +pip install --upgrade -r requirements.txt python manage.py migrate python manage.py compilemessages # Collect all staticfiles from dist/ and python packages to static/ diff --git a/templates/tutorialv2/includes/content_item_type_article.part.html b/templates/tutorialv2/includes/content_item_type_article.part.html index c4828a2eb6..0c7b85954d 100644 --- a/templates/tutorialv2/includes/content_item_type_article.part.html +++ b/templates/tutorialv2/includes/content_item_type_article.part.html @@ -19,6 +19,22 @@ {% endif %} {% endcaptureas %} +{% captureas content_title %} + {% if public_article and online %} + {{ public_article.title }} + {% else %} + {{ article.title }} + {% endif %} +{% endcaptureas %} + +{% captureas content_subtitle %} + {% if public_article and online %} + {{ public_article.description}} + {% else %} + {{ article.description }} + {% endif %} +{% endcaptureas %} + {# Authors (by X, Y and Z) ; can't have multiple whitespaces because of the title ! #} {% captureas authors_text %} {% for author in article.authors.all %}{% if forloop.first %}{% trans "par" %}{% elif forloop.last %} {% trans "et" %}{% else %},{% endif %} {% if author == user %}{% trans "vous" %}{% else %}{{ author.username }}{% endif %}{% endfor %} @@ -32,14 +48,14 @@
- +

- {{ article.title }} + {{ content_title }}

- {% if article.description and show_description %} - {{ article.description }} + {% if content_subtitle and show_description %} + {{ content_subtitle }} {% endif %}

@@ -72,7 +88,7 @@

{% if article.last_note %} {{ article.last_read_note.get_absolute_url }} {% else %} - {{ link }}#reactions + {{ link }}#comments {% endif %}" title="{% if note_count == 0 %}{% trans "Aucune réaction" %}{% else %}{{ note_count }} {% trans "réaction" %}{{ note_count|pluralize }}{% endif %}" > diff --git a/templates/tutorialv2/includes/content_item_type_tutoriel.part.html b/templates/tutorialv2/includes/content_item_type_tutoriel.part.html index 4d5dc2db97..54dc7927e5 100644 --- a/templates/tutorialv2/includes/content_item_type_tutoriel.part.html +++ b/templates/tutorialv2/includes/content_item_type_tutoriel.part.html @@ -19,6 +19,22 @@ {% endif %} {% endcaptureas %} +{% captureas content_title %} + {% if public_tutorial and online %} + {{ public_tutorial.title }} + {% else %} + {{ tutorial.title }} + {% endif %} +{% endcaptureas %} + +{% captureas content_subtitle %} + {% if public_tutorial and online %} + {{ public_tutorial.description }} + {% else %} + {{ tutorial.description }} + {% endif %} +{% endcaptureas %} + {# Authors (by X, Y and Z) ; can't have multiple whitespaces because of the title ! #} {% captureas authors_text %} {% for author in tutorial.authors.all %}{% if forloop.first %}{% trans "par" %}{% elif forloop.last %} {% trans "et" %}{% else %},{% endif %} {% if author == user %}{% trans "vous" %}{% else %}{{ author.username }}{% endif %}{% endfor %} @@ -30,7 +46,7 @@ {% endcaptureas %}
- +
{% if tutorial.image %} @@ -39,12 +55,12 @@

- {{ tutorial.title }} + {{ content_title }}

- {% if tutorial.description and show_description %} - {{ tutorial.description }} + {% if content_subtitle and show_description %} + {{ content_subtitle }} {% endif %}

diff --git a/templates/tutorialv2/includes/tags_authors.part.html b/templates/tutorialv2/includes/tags_authors.part.html index cecc0210e4..2d802199be 100644 --- a/templates/tutorialv2/includes/tags_authors.part.html +++ b/templates/tutorialv2/includes/tags_authors.part.html @@ -1,7 +1,7 @@ {% load date %} {% load i18n %} {% load category_url %} - +{% load set %} {% if content.subcategory.all|length > 0 %}
    @@ -11,19 +11,23 @@
{% endif %} +{% if online %} + {% set public_object.get_last_action_date as update_date %} +{% else %} + {% set content.update_date as update_date %} +{% endif %} - -{% if content.update_date %} +{% if update_date %} - {% if online and content.update_date == content.pubdate %} + {% if online and update_date == public_object.publication_date %} {% trans "Publié" %} : - diff --git a/templates/tutorialv2/index.html b/templates/tutorialv2/index.html index e9beeb39fc..40871b5099 100644 --- a/templates/tutorialv2/index.html +++ b/templates/tutorialv2/index.html @@ -56,7 +56,7 @@

{% include "misc/paginator.html" with position="top" %} {% if tutorials != None %} -
+
{% for tutorial in tutorials %} {% if filter == 'public' %} {% include "tutorialv2/includes/content_item_type_tutoriel.part.html" with show_description=True public_tutorial=tutorial.public_version %} @@ -65,9 +65,12 @@

{% include "tutorialv2/includes/content_item_type_tutoriel.part.html" with show_description=True type=type %} {% endif %} {% endfor %} +
+
+

{% elif articles != None %} -
+
{% for article in articles %} {% if filter == 'public' %} {% include "tutorialv2/includes/content_item_type_article.part.html" with show_description=True public_article=article.public_version %} @@ -76,6 +79,9 @@

{% include "tutorialv2/includes/content_item_type_article.part.html" with show_description=True type=type %} {% endif %} {% endfor %} +
+
+

{% endif %} diff --git a/templates/tutorialv2/index_online.html b/templates/tutorialv2/index_online.html index 9f45747b3d..4657d47c50 100644 --- a/templates/tutorialv2/index_online.html +++ b/templates/tutorialv2/index_online.html @@ -56,7 +56,7 @@

+
{% for public_content in public_contents %} {% if public_content.content_type == "TUTORIAL" %} {% include "tutorialv2/includes/content_item_type_tutoriel.part.html" with public_tutorial=public_content online=True show_description=True %} @@ -64,6 +64,9 @@

+
+

{% else %}

diff --git a/templates/tutorialv2/view/content.html b/templates/tutorialv2/view/content.html index 5aee417fba..e9e390631f 100644 --- a/templates/tutorialv2/view/content.html +++ b/templates/tutorialv2/view/content.html @@ -321,7 +321,7 @@

  • - + {% trans "Historique des versions" %}
    • diff --git a/zds/forum/models.py b/zds/forum/models.py index 916bdf57b0..52d12e6640 100644 --- a/zds/forum/models.py +++ b/zds/forum/models.py @@ -2,6 +2,7 @@ from django.conf import settings from django.db import models +from zds.settings import ZDS_APP from zds.utils import slugify from math import ceil import os @@ -307,24 +308,33 @@ def resolve_last_read_post_absolute_url(self): if user is None or not user.is_authenticated(): return self.resolve_first_post_url() else: - return '{0}?page=1#p{1}'.format( - self.get_absolute_url(), - self.resolve_last_post_pk_read_by_user(user)) + try: + pk, pos = self.resolve_last_post_pk_and_pos_read_by_user(user) + return '{}?page={}#p{}'.format( + self.get_absolute_url(), + pos / ZDS_APP["forum"]["posts_per_page"] + 1, pk) + except TopicRead.DoesNotExist: + return self.resolve_first_post_url() - def resolve_last_post_pk_read_by_user(self, user): - """get the primary key of the last post the user read + def resolve_last_post_pk_and_pos_read_by_user(self, user): + """get the primary key and position of the last post the user read :param user: the current (authenticated) user. Please do not try with unauthenticated user, il would lead to a \ useless request. :return: the primary key :rtype: int """ - return TopicRead.objects\ - .select_related('post')\ - .filter(topic__pk=self.pk, - user__pk=user.pk) \ - .latest('post__position')\ - .pk + t_read = TopicRead.objects\ + .select_related('post')\ + .filter(topic__pk=self.pk, + user__pk=user.pk) \ + .latest('post__position') + if t_read: + return t_read.post.pk, t_read.post.position + return Post.objects\ + .filter(topic__pk=self.pk)\ + .order_by('position')\ + .values('pk', "position").first().values() def resolve_first_post_url(self): """resolve the url that leads to this topic first post @@ -333,7 +343,7 @@ def resolve_first_post_url(self): """ pk = Post.objects\ .filter(topic__pk=self.pk)\ - .order_by('-position')\ + .order_by('position')\ .values('pk').first() return '{0}?page=1#p{1}'.format( diff --git a/zds/forum/tests/tests_views.py b/zds/forum/tests/tests_views.py index 749e9ec711..56d700b48a 100644 --- a/zds/forum/tests/tests_views.py +++ b/zds/forum/tests/tests_views.py @@ -273,6 +273,41 @@ def test_success_create_topic_with_a_post_in_get_method(self): self.assertEqual(forum, response.context['forum']) self.assertIsNotNone(response.context['form']) + def test_last_read_topic_url(self): + profile = ProfileFactory() + profile2 = ProfileFactory() + notvisited = ProfileFactory() + category, forum = create_category() + self.assertTrue(self.client.login(username=profile.user.username, password='hostel77')) + data = { + 'title': 'Title of the topic', + 'subtitle': 'Subtitle of the topic', + 'text': 'A new post!' + } + self.client.post(reverse('topic-new') + '?forum={}'.format(forum.pk), data, follow=False) + self.client.logout() + self.assertTrue(self.client.login(username=profile2.user.username, password='hostel77')) + data = { + 'title': 'Title of the topic', + 'subtitle': 'Subtitle of the topic', + 'text': 'A new post!' + } + self.client.post(reverse('topic-new') + '?forum={}'.format(forum.pk), data, follow=False) + self.client.logout() + self.assertTrue(self.client.login(username=profile.user.username, password='hostel77')) + topic = Topic.objects.last() + post = Post.objects.filter(topic__pk=topic.pk).first() + # for user + url = topic.resolve_last_read_post_absolute_url() + self.assertEquals(url, topic.get_absolute_url() + "?page=1#p" + str(post.pk)) + + # for anonymous + self.client.logout() + self.assertEquals(url, topic.get_absolute_url() + "?page=1#p" + str(post.pk)) + # for no visit + self.assertTrue(self.client.login(username=notvisited.user.username, password='hostel77')) + self.assertEquals(url, topic.get_absolute_url() + "?page=1#p" + str(post.pk)) + def test_success_create_topic_with_post_in_preview_in_ajax(self): profile = ProfileFactory() category, forum = create_category() diff --git a/zds/gallery/migrations/0003_auto_20150928_1249.py b/zds/gallery/migrations/0003_auto_20150928_1249.py new file mode 100644 index 0000000000..dec660ac84 --- /dev/null +++ b/zds/gallery/migrations/0003_auto_20150928_1249.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations +import zds.gallery.models +import easy_thumbnails.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('gallery', '0002_auto_20150409_2122'), + ] + + operations = [ + migrations.AlterField( + model_name='image', + name='physical', + field=easy_thumbnails.fields.ThumbnailerImageField(max_length=200, upload_to=zds.gallery.models.image_path), + preserve_default=True, + ), + ] diff --git a/zds/settings.py b/zds/settings.py index 23f6797c80..0f7fb3769e 100644 --- a/zds/settings.py +++ b/zds/settings.py @@ -468,7 +468,8 @@ 'user_page_number': 5, 'default_image': os.path.join(BASE_DIR, "fixtures", "noir_black.png"), 'import_image_prefix': 'archive', - 'build_pdf_when_published': True + 'build_pdf_when_published': True, + 'maximum_slug_size': 150 }, 'forum': { 'posts_per_page': 21, diff --git a/zds/tutorial/migrations/0002_auto_20150928_1249.py b/zds/tutorial/migrations/0002_auto_20150928_1249.py new file mode 100644 index 0000000000..6fcb01644d --- /dev/null +++ b/zds/tutorial/migrations/0002_auto_20150928_1249.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('tutorial', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='chapter', + name='image', + field=models.ForeignKey(on_delete=django.db.models.deletion.SET_NULL, verbose_name=b'Image du chapitre', blank=True, to='gallery.Image', null=True), + preserve_default=True, + ), + ] diff --git a/zds/tutorialv2/__init__.py b/zds/tutorialv2/__init__.py index 4dd9383c5e..d6baec8abc 100644 --- a/zds/tutorialv2/__init__.py +++ b/zds/tutorialv2/__init__.py @@ -1,3 +1,4 @@ import re REPLACE_IMAGE_PATTERN = re.compile(u'(?P)(?P!\[.*?\]\()(?P.+?)(?P\))') +VALID_SLUG = re.compile(r'^[a-z0-9\-_]+$') diff --git a/zds/tutorialv2/forms.py b/zds/tutorialv2/forms.py index 4f2a7a2ff1..558174d424 100644 --- a/zds/tutorialv2/forms.py +++ b/zds/tutorialv2/forms.py @@ -1,7 +1,6 @@ # coding: utf-8 from django import forms from django.conf import settings -from uuslug import slugify from crispy_forms.bootstrap import StrictButton from crispy_forms.helper import FormHelper @@ -15,6 +14,7 @@ from zds.tutorialv2.models.models_database import PublishableContent from django.utils.translation import ugettext_lazy as _ from zds.member.models import Profile +from zds.tutorialv2.utils import slugify_raise_on_invalid, InvalidSlugError class FormWithTitle(forms.Form): @@ -39,8 +39,11 @@ def clean(self): if 'title' in cleaned_data: del cleaned_data['title'] - if slugify(title).replace('-', '') == '': - self._errors['title'] = self.error_class([_(u'Ce titre n\'est pas autorisé, son slug est invalide !')]) + try: + slugify_raise_on_invalid(title) + except InvalidSlugError as e: + self._errors['title'] = self.error_class( + [_(u'Ce titre n\'est pas autorisé, son slug est invalide {}!').format(e if e.message != '' else '')]) return cleaned_data @@ -386,7 +389,7 @@ class ImportNewContentForm(ImportContentForm): subcategory = forms.ModelMultipleChoiceField( label=_(u"Sous catégories de votre contenu. Si aucune catégorie ne convient " u"n'hésitez pas à en demander une nouvelle lors de la validation !"), - queryset=SubCategory.objects.all(), + queryset=SubCategory.objects.order_by("title").all(), required=True, widget=forms.SelectMultiple( attrs={ @@ -635,6 +638,9 @@ def __init__(self, validation, *args, **kwargs): super(AcceptValidationForm, self).__init__(*args, **kwargs) + # if content is already published, it's probably a minor change, so do not check `is_major` + self.fields['is_major'].initial = not validation.content.sha_public + self.helper = FormHelper() self.helper.form_action = reverse('validation:accept', kwargs={'pk': validation.pk}) self.helper.form_method = 'post' diff --git a/zds/tutorialv2/management/commands/migrate_to_zep12.py b/zds/tutorialv2/management/commands/migrate_to_zep12.py index 0a9b1a3961..5b3b2368da 100644 --- a/zds/tutorialv2/management/commands/migrate_to_zep12.py +++ b/zds/tutorialv2/management/commands/migrate_to_zep12.py @@ -22,11 +22,11 @@ from zds.tutorialv2.models.models_database import PublishableContent, ContentReaction, ContentRead, PublishedContent,\ Validation -from zds.tutorialv2.utils import publish_content +from zds.tutorialv2.utils import publish_content, get_commit_author from django.core.management.base import BaseCommand from django.db import transaction from zds.gallery.models import Gallery, UserGallery, Image -from zds.utils import slugify +from uuslug import slugify from zds.utils.models import CommentLike, CommentDislike from datetime import datetime @@ -95,7 +95,7 @@ def export_comments(reacts, exported, read_class, old_last_note_pk): for dislike in CommentDislike.objects.filter(comments__pk=note.pk).all(): dislike.comments = new_reac dislike.save() - exported.save() + exported.save(update_date=False) def progressbar(it, prefix="", size=60): @@ -218,7 +218,7 @@ def copy_and_clean_repo(path_from, path_to): if len(to_delete) != 0: old_repo.index.remove(to_delete) - sha = old_repo.index.commit('Nettoyage pré-migratoire') + sha = old_repo.index.commit('Nettoyage pré-migratoire', **get_commit_author()) # then clone it to new repo old_repo.clone(path_to) @@ -248,7 +248,8 @@ def migrate_articles(): exported.licence = current.licence exported.js_support = current.js_support exported.pubdate = current.pubdate - exported.save() # before updating `ManyToMany` relation, we need to save ! + exported.update_date = current.update + exported.save(update_date=False) # before updating `ManyToMany` relation, we need to save ! try: clean_commit = copy_and_clean_repo(current.get_path(False), exported.get_repo_path(False)) @@ -317,7 +318,7 @@ def migrate_articles(): split_article_in_extracts(versioned) # create extracts from text exported.sha_draft = versioned.commit_changes(u'Migration version 2') exported.old_pk = current.pk - exported.save() + exported.save(update_date=False) reacts = Reaction.objects.filter(article__pk=current.pk)\ .select_related("author")\ @@ -343,7 +344,7 @@ def migrate_articles(): exported.update_date = current.update exported.sha_public = exported.sha_draft exported.public_version = published - exported.save() + exported.save(update_date=False) published.content_public_slug = exported.slug published.publication_date = exported.pubdate published.save() @@ -378,125 +379,129 @@ def migrate_tuto(tutos, title="Exporting mini tuto"): for i in progressbar(xrange(len(tutos)), title, 100): current = tutos[i] - if not os.path.exists(current.get_path(False)): - sys.stderr.write('Invalid physical path to repository « {} », skipping\n'.format(current.get_path(False))) - continue - exported = PublishableContent() - exported.slug = current.slug - exported.type = "TUTORIAL" - exported.title = current.title - exported.sha_draft = current.sha_draft - exported.sha_beta = current.sha_beta - exported.sha_validation = current.sha_validation - exported.licence = current.licence - exported.update_date = current.update - exported.creation_date = current.create_at - exported.description = current.description - exported.js_support = current.js_support - exported.source = current.source - exported.pubdate = current.pubdate - exported.save() - try: - clean_commit = copy_and_clean_repo(current.get_path(False), exported.get_repo_path(False)) - except InvalidGitRepositoryError as e: - exported.delete() - sys.stderr.write('Repository in « {} » is invalid, skipping\n'.format(e)) - continue - - if clean_commit: - exported.sha_draft = clean_commit - - # save clean up in old module to avoid any trouble - current.sha_draft = clean_commit - current.save() - - exported.gallery = current.gallery - exported.image = current.image - [exported.subcategory.add(category) for category in current.subcategory.all()] - [exported.helps.add(help) for help in current.helps.all()] - [exported.authors.add(author) for author in current.authors.all()] - exported.save() - - # now, re create the manifest.json - versioned = exported.load_version() + if not os.path.exists(current.get_path(False)): + sys.stderr.write( + 'Invalid physical path to repository « {} », skipping\n'.format(current.get_path(False))) + continue + exported = PublishableContent() + exported.slug = current.slug + exported.type = "TUTORIAL" + exported.title = current.title + exported.sha_draft = current.sha_draft + exported.sha_beta = current.sha_beta + exported.sha_validation = current.sha_validation + exported.licence = current.licence + exported.update_date = current.update + exported.creation_date = current.create_at + exported.description = current.description + exported.js_support = current.js_support + exported.source = current.source + exported.pubdate = current.pubdate + exported.save(update_date=False) - # this loop is there because of old .tuto import that failed with their chapter intros - for container in versioned.traverse(True): - if container.parent is None: + try: + clean_commit = copy_and_clean_repo(current.get_path(False), exported.get_repo_path(False)) + except InvalidGitRepositoryError as e: + exported.delete() + sys.stderr.write('Repository in « {} » is invalid, skipping\n'.format(e)) continue - # in old .tuto file chapter intro are represented as chapter_slug/introduction.md - # instead of part_slug/chapter_slug/introduction.md - corrected_intro_path = file_join(container.get_path(relative=False), "introduction.md") - corrected_ccl_path = file_join(container.get_path(relative=False), "conclusion.md") - if container.get_path(True) not in container.introduction: - if file_exists(corrected_intro_path): - container.introduction = file_join(container.get_path(relative=True), "introduction.md") - else: - container.introduction = None - if container.get_path(True) not in container.conclusion: - if file_exists(corrected_ccl_path): - container.conclusion = file_join(container.get_path(relative=True), "conclusion.md") - else: - container.conclusion = None - versioned.licence = exported.licence - versioned.type = "TUTORIAL" - versioned.dump_json() - versioned.repository.index.add(['manifest.json']) # index new manifest before commit - exported.sha_draft = versioned.commit_changes(u"Migration version 2") + if clean_commit: + exported.sha_draft = clean_commit + + # save clean up in old module to avoid any trouble + current.sha_draft = clean_commit + current.save() + + exported.gallery = current.gallery + exported.image = current.image + [exported.subcategory.add(category) for category in current.subcategory.all()] + [exported.helps.add(help) for help in current.helps.all()] + [exported.authors.add(author) for author in current.authors.all()] + exported.save(update_date=False) + + # now, re create the manifest.json + versioned = exported.load_version() + + # this loop is there because of old .tuto import that failed with their chapter intros + for container in versioned.traverse(True): + if container.parent is None: + continue + # in old .tuto file chapter intro are represented as chapter_slug/introduction.md + # instead of part_slug/chapter_slug/introduction.md + corrected_intro_path = file_join(container.get_path(relative=False), "introduction.md") + corrected_ccl_path = file_join(container.get_path(relative=False), "conclusion.md") + if container.get_path(True) not in container.introduction: + if file_exists(corrected_intro_path): + container.introduction = file_join(container.get_path(relative=True), "introduction.md") + else: + container.introduction = None + if container.get_path(True) not in container.conclusion: + if file_exists(corrected_ccl_path): + container.conclusion = file_join(container.get_path(relative=True), "conclusion.md") + else: + container.conclusion = None - exported.old_pk = current.pk - exported.save() - # export beta forum post - former_topic = Topic.objects.filter(key=current.pk).first() - if former_topic is not None: - former_topic.related_publishable_content = exported - - former_topic.save() - former_first_post = former_topic.first_post() - text = former_first_post.text - text = text.replace(current.get_absolute_url_beta(), exported.get_absolute_url_beta()) - former_first_post.update_content(text) - former_first_post.save() - exported.beta_topic = former_topic - exported.save() - # extract notes - reacts = Note.objects.filter(tutorial__pk=current.pk)\ - .select_related("author")\ - .order_by("pubdate")\ - .all() - migrate_validation(exported, TutorialValidation.objects.filter(tutorial__pk=current.pk)) - if current.last_note: - export_comments(reacts, exported, TutorialRead, current.last_note.pk) - if current.sha_public is not None and current.sha_public != "": - published = publish_content(exported, exported.load_version(current.sha_public), False) - exported.pubdate = current.pubdate - exported.sha_public = current.sha_public - exported.public_version = published - exported.save() - published.content_public_slug = exported.slug - published.publication_date = current.pubdate - - published.save() - # set mapping - map_previous = PublishedContent() - map_previous.content_public_slug = current.slug - map_previous.content_pk = current.pk - map_previous.content_type = 'TUTORIAL' - map_previous.must_redirect = True # will send HTTP 301 if visited ! - map_previous.content = exported - map_previous.save() - # fix strange notification bug - authors = list(exported.authors.all()) - reads_to_delete = ContentRead.objects\ - .filter(content=exported)\ - .exclude(user__pk__in=ContentReaction.objects - .filter(related_content=exported) - .exclude(author__in=authors) - .values_list("author__pk", flat=True)) - for read in reads_to_delete.all(): - read.delete() + versioned.licence = exported.licence + versioned.type = "TUTORIAL" + versioned.dump_json() + versioned.repository.index.add(['manifest.json']) # index new manifest before commit + exported.sha_draft = versioned.commit_changes(u"Migration version 2") + + exported.old_pk = current.pk + exported.save(update_date=False) + # export beta forum post + former_topic = Topic.objects.filter(key=current.pk).first() + if former_topic is not None: + former_topic.related_publishable_content = exported + + former_topic.save() + former_first_post = former_topic.first_post() + text = former_first_post.text + text = text.replace(current.get_absolute_url_beta(), exported.get_absolute_url_beta()) + former_first_post.update_content(text) + former_first_post.save() + exported.beta_topic = former_topic + exported.save(update_date=False) + # extract notes + reacts = Note.objects.filter(tutorial__pk=current.pk)\ + .select_related("author")\ + .order_by("pubdate")\ + .all() + migrate_validation(exported, TutorialValidation.objects.filter(tutorial__pk=current.pk)) + if current.last_note: + export_comments(reacts, exported, TutorialRead, current.last_note.pk) + if current.sha_public is not None and current.sha_public != "": + published = publish_content(exported, exported.load_version(current.sha_public), False) + exported.pubdate = current.pubdate + exported.sha_public = current.sha_public + exported.public_version = published + exported.save(update_date=False) + published.content_public_slug = exported.slug + published.publication_date = current.pubdate + published.save() + # set mapping + map_previous = PublishedContent() + map_previous.content_public_slug = current.slug + map_previous.content_pk = current.pk + map_previous.content_type = 'TUTORIAL' + map_previous.must_redirect = True # will send HTTP 301 if visited ! + map_previous.content = exported + map_previous.save() + # fix strange notification bug + authors = list(exported.authors.all()) + reads_to_delete = ContentRead.objects\ + .filter(content=exported)\ + .exclude(user__pk__in=ContentReaction.objects + .filter(related_content=exported) + .exclude(author__in=authors) + .values_list("author__pk", flat=True)) + for read in reads_to_delete.all(): + read.delete() + except Exception as e: + sys.stderr.write( + current.title + u" d'identifiant " + str(current.pk) + u" n'a pas été migré à cause de : " + str(e)) @transaction.atomic diff --git a/zds/tutorialv2/management/commands/upgrade_manifest_to_v2.py b/zds/tutorialv2/management/commands/upgrade_manifest_to_v2.py index 56359785d7..a58cf59467 100644 --- a/zds/tutorialv2/management/commands/upgrade_manifest_to_v2.py +++ b/zds/tutorialv2/management/commands/upgrade_manifest_to_v2.py @@ -1,7 +1,7 @@ from zds.tutorialv2.models.models_versioned import Extract, VersionedContent, Container from django.core.management.base import BaseCommand from zds.utils.models import Licence -from zds.utils import slugify +from uuslug import slugify import os try: diff --git a/zds/tutorialv2/migrations/0008_publishedcontent_update_date.py b/zds/tutorialv2/migrations/0008_publishedcontent_update_date.py new file mode 100644 index 0000000000..11e373b408 --- /dev/null +++ b/zds/tutorialv2/migrations/0008_publishedcontent_update_date.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('tutorialv2', '0007_auto_20150803_1059'), + ] + + operations = [ + migrations.AddField( + model_name='publishedcontent', + name='update_date', + field=models.DateTimeField(default=None, null=True, verbose_name=b'Date de mise \xc3\xa0 jour', db_index=True, blank=True), + preserve_default=True, + ), + ] diff --git a/zds/tutorialv2/mixins.py b/zds/tutorialv2/mixins.py index 29cbe7ab93..2f5eeef3bd 100644 --- a/zds/tutorialv2/mixins.py +++ b/zds/tutorialv2/mixins.py @@ -51,6 +51,7 @@ class SingleContentViewMixin(object): is_author = False only_draft_version = True must_redirect = False + public_is_prioritary = True def get_object(self, queryset=None): """ Get database representation of the content by its `pk`, then check permissions @@ -65,9 +66,9 @@ def get_object(self, queryset=None): elif 'pk' in self.request.POST: pk = int(self.request.POST['pk']) else: - raise Http404("Cannot find the 'pk' parameter.") + raise Http404(_(u"Impossible de trouver le paramètre 'pk'.")) except ValueError as badvalue: - raise Http404("The pk value '{}' is not a valid integer".format(badvalue)) + raise Http404(_(u"La valeur du paramètre pk '{}' n'est pas un entier valide.".format(badvalue))) queryset = PublishableContent.objects @@ -80,7 +81,7 @@ def get_object(self, queryset=None): obj = queryset.filter(pk=pk).first() if not obj: - raise Http404("No contents has this pk.") + raise Http404(_(u"Aucun contenu ne possède cet identifiant.")) # check permissions: self.is_staff = self.request.user.has_perm('tutorialv2.change_publishablecontent') @@ -112,7 +113,7 @@ def get_versioned_object(self): # if beta or public version, user can also access to it is_beta = self.object.is_beta(self.sha) - is_public = self.object.is_public(self.sha) + is_public = self.object.is_public(self.sha) and self.public_is_prioritary if not is_beta and not is_public and not self.is_author: if not self.is_staff or (not self.authorized_for_staff and self.must_be_author): @@ -126,7 +127,7 @@ def get_versioned_object(self): slug = self.kwargs['slug'] if versioned.slug != slug: if slug != self.object.slug: # retro-compatibility, but should raise permanent redirect instead - raise Http404("This slug does not exist for this content.") + raise Http404(_(u"Ce slug n'existe pas pour ce contenu.")) return versioned @@ -134,7 +135,10 @@ def get_public_object(self): """Get the published version, if any """ - return PublishedContent.objects.filter(content_pk=self.object.pk, must_redirect=False).last() + object = PublishedContent.objects.filter(content_pk=self.object.pk, must_redirect=False).last() + if object: + object.load_public_version() + return object class SingleContentPostMixin(SingleContentViewMixin): @@ -173,7 +177,7 @@ def form_invalid(self, form): messages.error(self.request, errors[errors.keys()[0]][0][0]) # only the first error is provided else: messages.error( - self.request, _(u'Une erreur inconnue est survenue durant le traitement des données')) + self.request, _(u'Une erreur inconnue est survenue durant le traitement des données.')) if hasattr(form, 'previous_page_url'): return redirect(form.previous_page_url) @@ -320,9 +324,9 @@ def get_public_object(self): elif 'pk' in self.request.POST: pk = int(self.request.POST['pk']) else: - raise Http404("Cannot find the 'pk' parameter.") + raise Http404(_(u"Impossible de trouver le paramètre 'pk'.")) except ValueError as badvalue: - raise Http404("The pk value '{}' is not a valid integer".format(badvalue)) + raise Http404(_(u"La valeur du paramètre pk '{}' n'est pas un entier valide.".format(badvalue))) queryset = PublishedContent.objects\ .filter(content_pk=pk)\ .prefetch_related('content')\ @@ -339,14 +343,14 @@ def get_public_object(self): obj = queryset.order_by('publication_date').last() # "last" version must be the most recent to be published if obj is None: - raise Http404("No contents has this slug.") + raise Http404(_(u"Aucun contenu ne possède ce slug.")) # Redirection ? if obj.must_redirect: if obj.content.public_version: raise MustRedirect(self.get_redirect_url(obj)) else: # should only happen if the content is unpublished - raise Http404("The redirection is activated but the content is not public.") + raise Http404(_(u"La redirection est activée mais le contenu n'est pas public.")) self.is_author = self.request.user in obj.content.authors.all() self.is_staff = self.request.user.has_perm('tutorialv2.change_publishablecontent') @@ -359,7 +363,7 @@ def get_object(self): obj = self.public_content_object.content if obj is None: - raise Http404("Online object not found") + raise Http404(_(u"Le contenu de la publication n'est pas trouvé.")) return obj def get_versioned_object(self): diff --git a/zds/tutorialv2/models/models_database.py b/zds/tutorialv2/models/models_database.py index 2fd5a0816c..16120ad258 100644 --- a/zds/tutorialv2/models/models_database.py +++ b/zds/tutorialv2/models/models_database.py @@ -125,16 +125,18 @@ def textual_type(self): :rtype: str """ if self.is_article(): - return _("L'Article") + return _(u"L'Article") else: - return _("Le Tutoriel") + return _(u"Le Tutoriel") def save(self, *args, **kwargs): """ Rewrite the `save()` function to handle slug uniqueness """ self.slug = uuslug(self.title, instance=self, max_length=80) - self.update_date = datetime.now() + update_date = kwargs.pop("update_date", True) + if update_date: + self.update_date = datetime.now() super(PublishableContent, self).save(*args, **kwargs) def get_absolute_url(self): @@ -282,7 +284,9 @@ def load_version_or_404(self, sha=None, public=None): try: return self.load_version(sha, public) except (BadObject, BadName, IOError) as error: - raise Http404("sha is not None and related version could not be found due to {}".format(str(error))) + raise Http404(_( + u"Le code sha existe mais la version demandée ne peut pas être trouvée à cause de {}".format( + str(error)))) def load_version(self, sha=None, public=None): """Using git, load a specific version of the content. if ``sha`` is ``None``, @@ -308,7 +312,7 @@ def load_version(self, sha=None, public=None): sha = self.sha_draft else: sha = self.sha_public - + max_title_length = PublishableContent._meta.get_field("title").max_length if public and isinstance(public, PublishedContent): # use the public (altered and not versioned) repository path = public.get_prod_path() slug = public.content_public_slug @@ -321,7 +325,8 @@ def load_version(self, sha=None, public=None): manifest = open(os.path.join(path, 'manifest.json'), 'r') json = json_reader.loads(manifest.read()) - versioned = get_content_from_json(json, public.sha_public, slug, public=True) + versioned = get_content_from_json(json, public.sha_public, + slug, public=True, max_title_len=max_title_length) else: # draft version, use the repository (slower, but allows manipulation) path = self.get_repo_path() @@ -338,7 +343,7 @@ def load_version(self, sha=None, public=None): raise BadManifestError( _(u'Une erreur est survenue lors de la lecture du manifest.json, est-ce du JSON ?')) - versioned = get_content_from_json(json, sha, self.slug) + versioned = get_content_from_json(json, sha, self.slug, max_title_len=max_title_length) self.insert_data_in_versioned(versioned) return versioned @@ -350,7 +355,7 @@ def insert_data_in_versioned(self, versioned): """ attrs = [ - 'pk', 'authors', 'authors', 'subcategory', 'image', 'creation_date', 'pubdate', 'update_date', 'source', + 'pk', 'authors', 'subcategory', 'image', 'creation_date', 'pubdate', 'update_date', 'source', 'sha_draft', 'sha_beta', 'sha_validation', 'sha_public' ] @@ -488,17 +493,6 @@ def antispam(self, user=None): if t.total_seconds() < settings.ZDS_APP['forum']['spam_limit_seconds']: return True - return False - - def change_type(self, new_type): - """Allow someone to change the content type, basically from tutorial to article - - :param new_type: the new type, either `"ARTICLE"` or `"TUTORIAL"` - """ - if new_type not in TYPE_CHOICES: - raise ValueError("This type of content does not exist") - self.type = new_type - def repo_delete(self): """ Delete the entities and their filesystem counterparts @@ -533,8 +527,6 @@ class PublishedContent(models.Model): Linked to a ``PublishableContent`` for the rest. Don't forget to add a ``.prefetch_related("content")`` !! """ - # TODO: by playing with this class, it may solve most of the SEO problems !! - class Meta: verbose_name = 'Contenu publié' verbose_name_plural = 'Contenus publiés' @@ -546,16 +538,30 @@ class Meta: content_pk = models.IntegerField('Pk du contenu publié', db_index=True) publication_date = models.DateTimeField('Date de publication', db_index=True, blank=True, null=True) + update_date = models.DateTimeField('Date de mise à jour', db_index=True, blank=True, null=True, default=None) sha_public = models.CharField('Sha1 de la version publiée', blank=True, null=True, max_length=80, db_index=True) must_redirect = models.BooleanField( 'Redirection vers une version plus récente', blank=True, db_index=True, default=False) objects = PublishedContentManager() + versioned_model = None def __unicode__(self): return _('Version publique de "{}"').format(self.content.title) + def title(self): + if self.versioned_model: + return self.versioned_model.title + else: + return self.load_public_version().title + + def description(self): + if self.versioned_model: + return self.versioned_model.description + else: + return self.load_public_version().description + def get_prod_path(self, relative=False): if not relative: return os.path.join(settings.ZDS_APP['content']['repo_public_path'], self.content_public_slug) @@ -568,12 +574,7 @@ def get_absolute_url_online(self): :return: the URL of the published content :rtype: str """ - reversed_ = '' - - if self.is_article(): - reversed_ = 'article' - elif self.is_tutorial(): - reversed_ = 'tutorial' + reversed_ = self.content_type.lower() return reverse(reversed_ + ':view', kwargs={'pk': self.content_pk, 'slug': self.content_public_slug}) @@ -583,14 +584,16 @@ def load_public_version_or_404(self): :rtype: zds.tutorialv2.models.models_database.PublicContent :raise Http404: if the version is not available """ - return self.content.load_version_or_404(sha=self.sha_public, public=self) + self.versioned_model = self.content.load_version_or_404(sha=self.sha_public, public=self) + return self.versioned_model def load_public_version(self): """ :rtype: zds.tutorialv2.models.models_database.PublicContent :return: the public content """ - return self.content.load_version(sha=self.sha_public, public=self) + self.versioned_model = self.content.load_version(sha=self.sha_public, public=self) + return self.versioned_model def is_article(self): """ @@ -682,12 +685,7 @@ def get_absolute_url_to_extra_content(self, type_): allowed_types = ['pdf', 'md', 'html', 'epub', 'zip'] if type_ in allowed_types: - reversed_ = '' - - if self.is_article(): - reversed_ = 'article' - elif self.is_tutorial(): - reversed_ = 'tutorial' + reversed_ = self.content_type.lower() return reverse( reversed_ + ':download-' + type_, kwargs={'pk': self.content_pk, 'slug': self.content_public_slug}) @@ -739,6 +737,9 @@ def get_absolute_url_zip(self): return self.get_absolute_url_to_extra_content('zip') + def get_last_action_date(self): + return self.update_date or self.publication_date + class ContentReaction(Comment): """ @@ -783,7 +784,7 @@ def save(self, force_insert=False, force_update=False, using=None, update_fields Save this model but check that if we have not a related note it is because the user is content author. """ if self.user not in self.content.authors.all() and self.note is None: - raise ValueError("Must be related to a note or be an author") + raise ValueError(_(u"La note doit exister ou l'utilisateur doit être l'un des auteurs.")) return super(ContentRead, self).save(force_insert, force_update, using, update_fields) diff --git a/zds/tutorialv2/models/models_versioned.py b/zds/tutorialv2/models/models_versioned.py index e9edc4f8f7..f35ca6f28f 100644 --- a/zds/tutorialv2/models/models_versioned.py +++ b/zds/tutorialv2/models/models_versioned.py @@ -12,9 +12,9 @@ from django.utils.translation import ugettext_lazy as _ from zds.settings import ZDS_APP from zds.tutorialv2.utils import default_slug_pool, export_content, get_commit_author, InvalidOperationError -from zds.utils import slugify +from uuslug import slugify from zds.utils.misc import compute_hash -from zds.tutorialv2.utils import get_blob +from zds.tutorialv2.utils import get_blob, InvalidSlugError, check_slug class Container: @@ -39,8 +39,6 @@ class Container: children_dict = {} slug_pool = {} - # TODO: thumbnails ? - def __init__(self, title, slug='', parent=None, position_in_parent=1): """Initialize the data model that will handle the dialog with raw versionned data at level container @@ -152,11 +150,22 @@ def get_unique_slug(self, title): """Generate a slug from title, and check if it is already in slug pool. If it is the case, recursively add a "-x" to the end, where "x" is a number starting from 1. When generated, it is added to the slug pool. + Note that the slug cannot be larger than `settings.ZDS_APP['content']['max_slug_size']`, due to maximum file + size limitation. + :param title: title from which the slug is generated (with ``slugify()``) :return: the unique slug :rtype: str """ base = slugify(title) + + if not check_slug(base): + raise InvalidSlugError(base, source=title) + + if len(base) > settings.ZDS_APP['content']['maximum_slug_size'] - 5: + # "-5" gives possibility to add "-xxxx" (up to 9999 possibility should be enough !) + base = base[:settings.ZDS_APP['content']['maximum_slug_size']] - 5 + find_slug = False new_slug = base @@ -278,7 +287,6 @@ def update_children(self): child.update_children() elif isinstance(child, Extract): child.text = child.get_path(relative=True) - # TODO : does this function should also rewrite `slug_pool` ? def get_path(self, relative=False): """Get the physical path to the draft version of the container. @@ -519,7 +527,7 @@ def repo_update(self, title, introduction, conclusion, commit_message='', do_com if do_commit: return self.top_container().commit_changes(commit_message) - def repo_add_container(self, title, introduction, conclusion, commit_message='', do_commit=True): + def repo_add_container(self, title, introduction, conclusion, commit_message='', do_commit=True, slug=None): """ :param title: title of the new container :param introduction: text of its introduction @@ -529,11 +537,13 @@ def repo_add_container(self, title, introduction, conclusion, commit_message='', :return: commit sha :rtype: str """ - subcontainer = Container(title) - + if slug is None: + subcontainer = Container(title) + else: + subcontainer = Container(title, slug=slug) # can a subcontainer be added ? try: - self.add_container(subcontainer, generate_slug=True) + self.add_container(subcontainer, generate_slug=slug is None) except InvalidOperationError: raise PermissionDenied @@ -552,20 +562,23 @@ def repo_add_container(self, title, introduction, conclusion, commit_message='', return subcontainer.repo_update( title, introduction, conclusion, commit_message=commit_message, do_commit=do_commit) - def repo_add_extract(self, title, text, commit_message='', do_commit=True): + def repo_add_extract(self, title, text, commit_message='', do_commit=True, slug=None): """ :param title: title of the new extract :param text: text of the new extract :param commit_message: commit message that will be used instead of the default one :param do_commit: perform the commit in repository if ``True`` + :param generate_slug: indicates that is must generate slug :return: commit sha :rtype: str """ - extract = Extract(title) - + if not slug: + extract = Extract(title) + else: + extract = Extract(title, slug) # can an extract be added ? try: - self.add_extract(extract, generate_slug=True) + self.add_extract(extract, generate_slug=slug is None) except InvalidOperationError: raise PermissionDenied @@ -612,10 +625,10 @@ def move_child_up(self, child_slug): :raise IndexError: if the extract is already the first child """ if child_slug not in self.children_dict: - raise ValueError(child_slug + " does not exist") + raise ValueError(_(child_slug + " n'existe pas.")) child_pos = self.children.index(self.children_dict[child_slug]) if child_pos == 0: - raise IndexError(child_slug + " is the first element") + raise IndexError(_(child_slug + " est le premier élément.")) self.children[child_pos], self.children[child_pos - 1] = self.children[child_pos - 1], self.children[child_pos] self.children[child_pos].position_in_parent = child_pos + 1 self.children[child_pos - 1].position_in_parent = child_pos @@ -629,10 +642,10 @@ def move_child_down(self, child_slug): :raise IndexError: if the extract is already the last child """ if child_slug not in self.children_dict: - raise ValueError(child_slug + " does not exist") + raise ValueError(_(child_slug + " n'existe pas.")) child_pos = self.children.index(self.children_dict[child_slug]) if child_pos == len(self.children) - 1: - raise IndexError(child_slug + " is the last element") + raise IndexError(_(child_slug + " est le dernier élément.")) self.children[child_pos], self.children[child_pos + 1] = self.children[child_pos + 1], self.children[child_pos] self.children[child_pos].position_in_parent = child_pos self.children[child_pos + 1].position_in_parent = child_pos + 1 @@ -646,9 +659,9 @@ def move_child_after(self, child_slug, refer_slug): :raise ValueError: if one slug does not refer to an existing child """ if child_slug not in self.children_dict: - raise ValueError(child_slug + " does not exist") + raise ValueError(_(child_slug + " n'existe pas.")) if refer_slug not in self.children_dict: - raise ValueError(refer_slug + " does not exist") + raise ValueError(_(refer_slug + " n'existe pas.")) child_pos = self.children.index(self.children_dict[child_slug]) refer_pos = self.children.index(self.children_dict[refer_slug]) @@ -670,9 +683,9 @@ def move_child_before(self, child_slug, refer_slug): :raise ValueError: if one slug does not refer to an existing child """ if child_slug not in self.children_dict: - raise ValueError(child_slug + " does not exist") + raise ValueError(_(child_slug + " n'existe pas.")) if refer_slug not in self.children_dict: - raise ValueError(refer_slug + " does not exist") + raise ValueError(_(refer_slug + " n'existe pas.")) child_pos = self.children.index(self.children_dict[child_slug]) refer_pos = self.children.index(self.children_dict[refer_slug]) @@ -1056,9 +1069,9 @@ def textual_type(self): :rtype: str """ if self.is_article: - return _("L'Article") + return _(u"L'Article") else: - return _("Le Tutoriel") + return _(u"Le Tutoriel") def get_absolute_url(self, version=None): """ diff --git a/zds/tutorialv2/tests/tests_models.py b/zds/tutorialv2/tests/tests_models.py index 77cdd624e0..a8d92cc40f 100644 --- a/zds/tutorialv2/tests/tests_models.py +++ b/zds/tutorialv2/tests/tests_models.py @@ -1,5 +1,6 @@ # coding: utf-8 - +from django.core.urlresolvers import reverse +from datetime import datetime, timedelta import os import shutil @@ -9,8 +10,11 @@ from zds.settings import BASE_DIR from zds.member.factories import ProfileFactory, StaffProfileFactory -from zds.tutorialv2.factories import PublishableContentFactory, ContainerFactory, ExtractFactory, LicenceFactory +from zds.tutorialv2.factories import PublishableContentFactory, ContainerFactory, ExtractFactory, LicenceFactory, \ + PublishedContentFactory, SubCategoryFactory from zds.gallery.factories import UserGalleryFactory +from zds.tutorialv2.models.models_database import PublishableContent +from zds.tutorialv2.utils import publish_content overrided_zds_app = settings.ZDS_APP overrided_zds_app['content']['repo_private_path'] = os.path.join(BASE_DIR, 'contents-private-test') @@ -424,6 +428,44 @@ def test_ensure_slug_stay(self): for index, child in enumerate(current.children[0].children): self.assertEqual(child.slug, chapter.children[index].slug) # slug remains for extract as well ! + def test_publication_and_attributes_consistency(self): + pubdate = datetime.now() - timedelta(days=1) + article = PublishedContentFactory(type="ARTILCE", author_list=[self.user_author]) + public_version = article.public_version + public_version.publication_date = pubdate + public_version.save() + # everything must come from database to have good datetime comparison + article = PublishableContent.objects.get(pk=article.pk) + article.public_version.load_public_version() + old_date = article.public_version.publication_date + old_title = article.public_version.title() + old_description = article.public_version.description() + article.licence = LicenceFactory() + article.save() + self.assertEqual( + self.client.login( + username=self.user_author.username, + password='hostel77'), + True) + self.client.post(reverse("content:edit", args=[article.pk, article.slug]), { + "title": old_title + "bla", + "description": old_description + "bla", + "type": "ARTICLE", + "licence": article.licence.pk, + "subcategory": SubCategoryFactory().pk, + "last_hash": article.sha_draft + }) + article = PublishableContent.objects.prefetch_related("public_version").get(pk=article.pk) + article.public_version.load_public_version() + self.assertEqual(old_title, article.public_version.title()) + self.assertEqual(old_description, article.public_version.description()) + self.assertEqual(old_date, article.public_version.publication_date) + publish_content(article, article.load_version(), False) + article = PublishableContent.objects.get(pk=article.pk) + article.public_version.load_public_version() + self.assertEqual(old_date, article.public_version.publication_date) + self.assertNotEqual(old_date, article.public_version.update_date) + def tearDown(self): if os.path.isdir(settings.ZDS_APP['content']['repo_private_path']): shutil.rmtree(settings.ZDS_APP['content']['repo_private_path']) diff --git a/zds/tutorialv2/tests/tests_utils.py b/zds/tutorialv2/tests/tests_utils.py index d64d2ef9c2..3ecabdb74b 100644 --- a/zds/tutorialv2/tests/tests_utils.py +++ b/zds/tutorialv2/tests/tests_utils.py @@ -10,13 +10,16 @@ from django.test.utils import override_settings from zds.forum.models import Topic from zds.settings import BASE_DIR +from django.core.urlresolvers import reverse from zds.member.factories import ProfileFactory, StaffProfileFactory from zds.tutorialv2.factories import PublishableContentFactory, ContainerFactory, LicenceFactory, ExtractFactory, \ PublishedContentFactory from zds.gallery.factories import UserGalleryFactory +from zds.tutorialv2.models.models_versioned import Container from zds.tutorialv2.utils import get_target_tagged_tree_for_container, publish_content, unpublish_content, \ - get_target_tagged_tree_for_extract, retrieve_and_update_images_links + get_target_tagged_tree_for_extract, retrieve_and_update_images_links, last_participation_is_old, \ + InvalidSlugError, BadManifestError, get_content_from_json, get_commit_author, slugify_raise_on_invalid, check_slug from zds.tutorialv2.models.models_database import PublishableContent, PublishedContent, ContentReaction, ContentRead from django.core.management import call_command from zds.tutorial.factories import BigTutorialFactory, MiniTutorialFactory, PublishedMiniTutorial, NoteFactory, \ @@ -578,6 +581,127 @@ def test_generate_pdf(self): self.assertFalse(os.path.exists(pdf_path)) self.assertFalse(os.path.exists(pdf_path2)) # so no PDF is generated ! + def test_last_participation_is_old(self): + article = PublishedContentFactory(author_list=[self.user_author], type="ARTICLE") + newUser = ProfileFactory().user + reac = ContentReaction(author=self.user_author, position=1, related_content=article) + reac.update_content("I will find you. And I Will Kill you.") + reac.save() + article.last_note = reac + article.save() + + self.assertFalse(last_participation_is_old(article, newUser)) + ContentRead(user=self.user_author, note=reac, content=article).save() + reac = ContentReaction(author=newUser, position=2, related_content=article) + reac.update_content("I will find you. And I Will Kill you.") + reac.save() + article.last_note = reac + article.save() + ContentRead(user=newUser, note=reac, content=article).save() + self.assertFalse(last_participation_is_old(article, newUser)) + self.assertTrue(last_participation_is_old(article, self.user_author)) + + def testParseBadManifest(self): + base_content = PublishableContentFactory(author_list=[self.user_author]) + versioned = base_content.load_version() + versioned.add_container(Container(u"un peu plus près de 42")) + versioned.dump_json() + manifest = os.path.join(versioned.get_path(), "manifest.json") + dictionary = json_reader.load(open(manifest)) + + old_title = dictionary['title'] + + # first bad title + dictionary['title'] = 81 * ['a'] + self.assertRaises(BadManifestError, + get_content_from_json, dictionary, None, '', + max_title_len=PublishableContent._meta.get_field('title').max_length) + dictionary['title'] = "".join(dictionary['title']) + self.assertRaises(BadManifestError, + get_content_from_json, dictionary, None, '', + max_title_len=PublishableContent._meta.get_field('title').max_length) + dictionary['title'] = '...' + self.assertRaises(InvalidSlugError, + get_content_from_json, dictionary, None, '', + max_title_len=PublishableContent._meta.get_field('title').max_length) + + dictionary['title'] = old_title + dictionary['children'][0]['title'] = 81 * ['a'] + self.assertRaises(BadManifestError, + get_content_from_json, dictionary, None, '', + max_title_len=PublishableContent._meta.get_field('title').max_length) + + dictionary['children'][0]['title'] = "bla" + dictionary['children'][0]['slug'] = "..." + self.assertRaises(InvalidSlugError, + get_content_from_json, dictionary, None, '', + max_title_len=PublishableContent._meta.get_field('title').max_length) + + def test_get_commit_author(self): + """Ensure the behavior of `get_commit_author()` : + - `git.Actor` use the pk of the bot account when no one is connected + - `git.Actor` use the pk (and the email) of the connected account when available + + (Implementation of `git.Actor` is there : + https://github.com/gitpython-developers/GitPython/blob/master/git/util.py#L312) + """ + + # 1. With user connected + self.assertEqual( + self.client.login( + username=self.user_author.username, + password='hostel77'), + True) + + # go to whatever page, if not, `get_current_user()` does not work at all + result = self.client.get(reverse('zds.pages.views.index')) + self.assertEqual(result.status_code, 200) + + actor = get_commit_author() + self.assertEqual(actor['committer'].name, str(self.user_author.pk)) + self.assertEqual(actor['author'].name, str(self.user_author.pk)) + self.assertEqual(actor['committer'].email, self.user_author.email) + self.assertEqual(actor['author'].email, self.user_author.email) + + # 2. Without connected user + self.client.logout() + + # as above ... + result = self.client.get(reverse('zds.pages.views.index')) + self.assertEqual(result.status_code, 200) + + actor = get_commit_author() + self.assertEqual(actor['committer'].name, str(self.mas.pk)) + self.assertEqual(actor['author'].name, str(self.mas.pk)) + + def invalid_slug_is_invalid(self): + """ensure that an exception is raised when it should""" + + # exception are raised when title are invalid + invalid_titles = [u'-', u'_', u'__', u'-_-', u'$', u'@', u'&', u'{}', u' ', u'...'] + + for t in invalid_titles: + self.assertRaises(InvalidSlugError, slugify_raise_on_invalid, t) + + # Those slugs are recognized as wrong slug + invalid_slugs = [ + u'', # empty + u'----', # empty + u'___', # empty + u'-_-', # empty (!) + u'&;', # invalid characters + u'!{', # invalid characters + u'@', # invalid character + u'a ' # space ! + ] + + for s in invalid_slugs: + self.assertFalse(check_slug(s)) + + # too long slugs are forbidden : + too_damn_long_slug = 'a' * (settings.ZDS_APP['content']['maximum_slug_size'] + 1) + self.assertFalse(check_slug(too_damn_long_slug)) + def tearDown(self): if os.path.isdir(settings.ZDS_APP['content']['repo_private_path']): shutil.rmtree(settings.ZDS_APP['content']['repo_private_path']) diff --git a/zds/tutorialv2/tests/tests_views.py b/zds/tutorialv2/tests/tests_views.py index f3149d74c6..2a3725dea6 100644 --- a/zds/tutorialv2/tests/tests_views.py +++ b/zds/tutorialv2/tests/tests_views.py @@ -256,6 +256,7 @@ def test_basic_tutorial_workflow(self): 'type': u'TUTORIAL', 'licence': self.licence.pk, 'subcategory': self.subcategory.pk, + 'image': open('{}/fixtures/noir_black.png'.format(settings.BASE_DIR)) }, follow=False) self.assertEqual(result.status_code, 302) @@ -266,6 +267,9 @@ def test_basic_tutorial_workflow(self): slug = tuto.slug versioned = tuto.load_version() + self.assertEqual(Gallery.objects.filter(pk=tuto.gallery.pk).count(), 1) + self.assertEqual(Image.objects.filter(gallery__pk=tuto.gallery.pk).count(), 1) # icon is uploaded + # access to tutorial result = self.client.get( reverse('content:edit', args=[pk, slug]), @@ -285,11 +289,14 @@ def test_basic_tutorial_workflow(self): 'type': u'TUTORIAL', 'licence': new_licence.pk, 'subcategory': self.subcategory.pk, - 'last_hash': versioned.compute_hash() + 'last_hash': versioned.compute_hash(), + 'image': open('{}/fixtures/logo.png'.format(settings.BASE_DIR)) }, follow=False) self.assertEqual(result.status_code, 302) + 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) @@ -580,14 +587,15 @@ def test_beta_workflow(self): 'version': current_sha_beta }, follow=False) + tuto = PublishableContent.objects.get(pk=self.tuto.pk) self.assertEqual(result.status_code, 302) # check if there is a new topic and a pm corresponding to the tutorial in beta self.assertEqual(Topic.objects.filter(forum=self.beta_forum).count(), 1) self.assertTrue(PublishableContent.objects.get(pk=self.tuto.pk).beta_topic is not None) self.assertEqual(PrivateTopic.objects.filter(author=self.user_author).count(), 1) - beta_topic = PublishableContent.objects.get(pk=self.tuto.pk).beta_topic + self.assertTrue(beta_topic.is_followed(self.user_author)) self.assertEqual(Post.objects.filter(topic=beta_topic).count(), 1) self.assertEqual(beta_topic.tags.count(), 1) self.assertEqual(beta_topic.tags.first().title, smart_text(self.subcategory.title).lower()[:20]) @@ -2656,8 +2664,9 @@ def test_warn_typo(self): self.assertEqual(302, response.status_code) sha_beta = PublishableContent.objects.get(pk=tuto.pk).sha_beta self.assertEqual(sha_draft, sha_beta) - tuto = PublishableContent.objects.get(pk=tuto.pk) + # checks the user follow it + self.assertEqual(TopicRead.objects.filter(topic__pk=tuto.beta_topic.pk).count(), 1) versioned = tuto.load_version(sha_beta) # check if author get error when warning typo on its own tutorial @@ -3267,6 +3276,8 @@ def test_publication_make_extra_contents(self): self.assertTrue(published.have_type(extra)) result = self.client.get(published.get_absolute_url_to_extra_content(extra)) self.assertEqual(result.status_code, 200) + + # test that deletion give a 404 markdown_url = published.get_absolute_url_md() md_path = os.path.join(published.get_extra_contents_directory(), published.content_public_slug + '.md') os.remove(md_path) @@ -3274,8 +3285,9 @@ def test_publication_make_extra_contents(self): self.assertEqual('', published.get_absolute_url_to_extra_content('kboom')) self.client.logout() - with open(md_path, "w") as f: + with open(md_path, "w") as f: # remake a .md file, whatever the content f.write("I rebuilt it to finish the test. Perhaps a funny quote would be a good thing?") + # same test with author: self.assertEqual( self.client.login( @@ -3602,7 +3614,7 @@ def test_no_invalid_titles(self): 'subcategory': self.subcategory.pk, } - disallowed_titles = [u'-', u'_', u'__', u'-_-', u'$', u'@', u'&', u'{}', u' '] + disallowed_titles = [u'-', u'_', u'__', u'-_-', u'$', u'@', u'&', u'{}', u' ', u'...'] for title in disallowed_titles: dic['title'] = title @@ -3611,6 +3623,20 @@ def test_no_invalid_titles(self): self.assertEqual(PublishableContent.objects.all().count(), 1) self.assertFalse(result.context['form'].is_valid()) + # Due to the internal use of `unicodedata.normalize()` by uuslug, some unicode characters are translated, and + # therefor gives allowed titles, let's ensure that ! + # (see https://docs.python.org/2/library/unicodedata.html#unicodedata.normalize and + # https://github.com/un33k/python-slugify/blob/master/slugify/slugify.py#L117 for implementation !) + allowed_titles = [u'€€', u'£€'] + prev_count = 1 + + for title in allowed_titles: + dic['title'] = title + result = self.client.post(reverse('content:create-tutorial'), dic, follow=False) + self.assertEqual(result.status_code, 302) + self.assertNotEqual(PublishableContent.objects.all().count(), prev_count) + prev_count += 1 + def tearDown(self): if os.path.isdir(settings.ZDS_APP['content']['repo_private_path']): @@ -4175,9 +4201,8 @@ def test_add_note(self): self.client.get(reverse("tutorial:view", args=[self.tuto.pk, self.tuto.slug])).status_code, 200) reads = ContentRead.objects.filter(user=self.user_staff).all() - self.assertEqual(len(reads), 1) - self.assertEqual(reads[0].content.pk, self.tuto.pk) - self.assertEqual(reads[0].note.pk, reactions[0].pk) + # simple visit does not trigger follow + self.assertEqual(len(reads), 0) # login with author self.assertEqual( @@ -4321,7 +4346,24 @@ def test_hide_reaction(self): self.assertEqual(reaction.text_hidden, text_hidden[:80]) self.assertEqual(reaction.editor, self.user_staff) + # test that someone else is not abble to quote the text + self.assertEqual( + self.client.login( + username=self.user_guest.username, + password='hostel77'), + True) + + result = self.client.get( + reverse("content:add-reaction") + u'?pk={}&cite={}'.format(self.tuto.pk, reaction.pk), follow=False) + self.assertEqual(result.status_code, 403) # unable to quote a reaction if hidden + # then, unhide it ! + self.assertEqual( + self.client.login( + username=self.user_guest.username, + password='hostel77'), + True) + result = self.client.post( reverse('content:show-reaction', args=[reaction.pk]), follow=False) @@ -4756,7 +4798,7 @@ def test_last_reactions(self): tuto = PublishableContent.objects.get(pk=self.tuto.pk) - reactions = ContentReaction.objects.filter(related_content=self.tuto).all() + reactions = list(ContentReaction.objects.filter(related_content=self.tuto).all()) self.assertEqual(len(reactions), 2) self.assertEqual(ContentRead.objects.filter(user=self.user_author).count(), 1) # reaction read @@ -4817,31 +4859,102 @@ def test_last_reactions(self): result = self.client.get(reverse('zds.pages.views.index')) # go to whatever page self.assertEqual(result.status_code, 200) - # login with staff + def test_note_with_bad_param(self): self.assertEqual( self.client.login( username=self.user_staff.username, password='hostel77'), True) + url_template = reverse("content:update-reaction") + "?pk={}&message={}" + result = self.client.get(url_template.format(self.tuto.pk, 454545665895123)) + self.assertEqual(404, result.status_code) + reaction = ContentReaction(related_content=self.tuto, author=self.user_guest, position=1) + reaction.update_content("blah") + reaction.save() + self.tuto.last_note = reaction + self.tuto.save() + result = self.client.get(url_template.format(861489632, reaction.pk)) + self.assertEqual(404, result.status_code) - result = self.client.get(reverse('zds.pages.views.index')) # go to whatever page - self.assertEqual(result.status_code, 200) + def test_cant_edit_not_owned_note(self): + article = PublishedContentFactory(author_list=[self.user_author], type="ARTICLE") + newUser = ProfileFactory().user + newReaction = ContentReaction(related_content=article, position=1) + newReaction.update_content("I will find you. And I will Kill you.") + newReaction.author = self.user_guest - self.assertEqual(ContentRead.objects.filter(user=self.user_staff).count(), 0) + newReaction.save() + self.assertEqual( + self.client.login( + username=newUser.username, + password='hostel77'), + True) + resp = self.client.get( + reverse('content:update-reaction') + "?message={}&pk={}".format(newReaction.pk, article.pk)) + self.assertEqual(403, resp.status_code) + resp = self.client.post( + reverse('content:update-reaction') + "?message={}&pk={}".format(newReaction.pk, article.pk), + { + 'text': "I edited it" + }) + self.assertEqual(403, resp.status_code) + + def test_quote_note(self): + """ Ensure the behavior of the `&cite=xxx` parameter on "content:add-reaction" + """ tuto = PublishableContent.objects.get(pk=self.tuto.pk) - self.assertEqual(tuto.last_read_note(), reactions[0]) # if never read, last note=first note - self.assertEqual(tuto.first_unread_note(), reactions[0]) + text = u'À force de temps, de patience et de crachats, ' \ + u'on met un pépin de callebasse dans le derrière d\'un moustique (proverbe créole)' - # visit tutorial and read the two notes: - result = self.client.get(reverse('tutorial:view', kwargs={'pk': tuto.pk, 'slug': tuto.slug})) - self.assertEqual(result.status_code, 200) + # add note : + reaction = ContentReaction(related_content=tuto, position=1) + reaction.update_content(text) + reaction.author = self.user_guest + reaction.save() - self.assertEqual(ContentRead.objects.filter(user=self.user_staff).count(), 1) + self.assertEqual( + self.client.login( + username=self.user_author.username, + password='hostel77'), + True) - tuto = PublishableContent.objects.get(pk=self.tuto.pk) - self.assertEqual(tuto.last_read_note(), reactions[1]) # now reactions are read - self.assertEqual(tuto.first_unread_note(), reactions[1]) + # cite note + result = self.client.get( + reverse("content:add-reaction") + u'?pk={}&cite={}'.format(tuto.pk, reaction.pk), follow=True) + self.assertEqual(200, result.status_code) + + self.assertTrue(text in result.context['form'].initial['text']) # ok, text quoted ! + + # cite with a abnormal parameter raises 404 + result = self.client.get( + reverse("content:add-reaction") + u'?pk={}&cite={}'.format(tuto.pk, 'lililol'), follow=True) + self.assertEqual(404, result.status_code) + + # cite not existing note just gives the form empty + result = self.client.get( + reverse("content:add-reaction") + u'?pk={}&cite={}'.format(tuto.pk, 99999999), follow=True) + self.assertEqual(200, result.status_code) + + self.assertTrue('text' not in result.context['form']) # nothing quoted, so no text cited + + # it's not possible to cite an hidden note (get 403) + reaction.is_visible = False + reaction.save() + + result = self.client.get( + reverse("content:add-reaction") + u'?pk={}&cite={}'.format(tuto.pk, reaction.pk), follow=True) + self.assertEqual(403, result.status_code) + + def test_cant_view_private_even_if_draft_is_equal_to_public(self): + content = PublishedContentFactory(author_list=[self.user_author]) + self.assertEqual( + self.client.login( + username=self.user_guest.username, + password='hostel77'), + True) + resp = self.client.get(reverse("content:view", args=[content.pk, content.slug])) + self.assertEqual(403, resp.status_code) def tearDown(self): diff --git a/zds/tutorialv2/urls/urls_contents.py b/zds/tutorialv2/urls/urls_contents.py index 0936aedf7a..3a29c6bd91 100644 --- a/zds/tutorialv2/urls/urls_contents.py +++ b/zds/tutorialv2/urls/urls_contents.py @@ -21,23 +21,24 @@ url(r'^aides/$', ContentsWithHelps.as_view(), name='helps'), url(r'^(?P\d+)/(?P.+)/(?P.+)/(?P.+)/$', - DisplayContainer.as_view(), + DisplayContainer.as_view(public_is_prioritary=False), name='view-container'), url(r'^(?P\d+)/(?P.+)/(?P.+)/$', - DisplayContainer.as_view(), + DisplayContainer.as_view(public_is_prioritary=False), name='view-container'), - url(r'^(?P\d+)/(?P.+)/$', DisplayContent.as_view(), name='view'), + url(r'^(?P\d+)/(?P.+)/$', DisplayContent.as_view(public_is_prioritary=False), + name='view'), url(r'^telecharger/(?P\d+)/(?P.+)/$', DownloadContent.as_view(), name='download-zip'), # beta: url(r'^beta/(?P\d+)/(?P.+)/(?P.+)/(?P.+)/$', - DisplayBetaContainer.as_view(), + DisplayBetaContainer.as_view(public_is_prioritary=False), name='beta-view-container'), url(r'^beta/(?P\d+)/(?P.+)/(?P.+)/$', - DisplayBetaContainer.as_view(), + DisplayBetaContainer.as_view(public_is_prioritary=False), name='beta-view-container'), url(r'^beta/(?P\d+)/(?P.+)/$', DisplayBetaContent.as_view(), name='beta-view'), @@ -58,7 +59,7 @@ # create: url(r'^nouveau-tutoriel/$', CreateContent.as_view(created_content_type="TUTORIAL"), name='create-tutorial'), - url(r'^nouveau-article/$', + url(r'^nouvel-article/$', CreateContent.as_view(created_content_type="ARTICLE"), name='create-article'), url(r'^nouveau-conteneur/(?P\d+)/(?P.+)/(?P.+)/$', CreateContainer.as_view(), diff --git a/zds/tutorialv2/utils.py b/zds/tutorialv2/utils.py index dca6c877ed..0b2b2b26f8 100644 --- a/zds/tutorialv2/utils.py +++ b/zds/tutorialv2/utils.py @@ -21,12 +21,25 @@ from django.utils import translation from zds.search.models import SearchIndexContent -from zds.tutorialv2 import REPLACE_IMAGE_PATTERN +from zds.tutorialv2 import REPLACE_IMAGE_PATTERN, VALID_SLUG from zds import settings from zds.settings import ZDS_APP -from zds.utils import get_current_user, slugify +from zds.utils import get_current_user +from uuslug import slugify +from zds.utils import slugify as old_slugify from zds.utils.models import Licence from zds.utils.templatetags.emarkdown import emarkdown +from zds.member.models import User + + +def all_is_string_appart_from_children(dict_representation): + """check all keys are string appart from the children key + :param dict_representation: the json decoded dictionary + :type dict_representation: dict + :return: + :rtype: bool + """ + return all([isinstance(value, basestring) for key, value in dict_representation.items() if key != "children"]) def search_container_or_404(base_content, kwargs_array): @@ -53,10 +66,10 @@ def search_container_or_404(base_content, kwargs_array): try: container = base_content.children_dict[kwargs_array['parent_container_slug']] except KeyError: - raise Http404("No container found.") + raise Http404(_(u"Aucun conteneur trouvé.")) else: if not isinstance(container, Container): - raise Http404("No container found.") + raise Http404(_(u"Aucun conteneur trouvé.")) else: container = base_content @@ -65,15 +78,15 @@ def search_container_or_404(base_content, kwargs_array): try: container = container.children_dict[kwargs_array['container_slug']] except KeyError: - raise Http404("No container found.") + raise Http404(_(u"Aucun conteneur trouvé.")) else: if not isinstance(container, Container): - raise Http404("No container found.") + raise Http404(_(u"Aucun conteneur trouvé.")) elif container == base_content: # if we have no subcontainer, there is neither "container_slug" nor "parent_container_slug return base_content if container is None: - raise Http404("No container found.") + raise Http404(_(u"Aucun conteneur trouvé.")) return container @@ -97,10 +110,10 @@ def search_extract_or_404(base_content, kwargs_array): try: extract = container.children_dict[kwargs_array['extract_slug']] except KeyError: - raise Http404("No extract found.") + raise Http404(_(u"Aucun extrait trouvé.")) else: if not isinstance(extract, Extract): - raise Http404("No extract found.") + raise Http404(_(u"Aucun extrait trouvé.")) return extract @@ -129,6 +142,17 @@ def never_read(content, user=None): return True +def last_participation_is_old(content, user): + from zds.tutorialv2.models.models_database import ContentRead, ContentReaction + if user is None or not user.is_authenticated(): + return False + if ContentReaction.objects.filter(author__pk=user.pk, related_content__pk=content.pk).count() == 0: + return False + return ContentRead.objects\ + .filter(note__pk=content.last_note.pk, content__pk=content.pk, user__pk=user.pk)\ + .count() == 0 + + def mark_read(content, user=None): """Mark the last tutorial note as read for the user. @@ -451,8 +475,6 @@ def publish_container(db_object, base_dir, container): if not isinstance(container, Container): raise FailureDuringPublication(_(u'Le conteneur n\'en est pas un !')) - # TODO: images stuff !! - template = 'tutorialv2/export/chapter.html' # jsFiddle support @@ -565,6 +587,7 @@ def publish_content(db_object, versioned, is_major_update=True): # 1. markdown file (base for the others) : # If we come from a command line, we need to activate i18n, to have the date in the french language. cur_language = translation.get_language() + versioned.pubdate = datetime.now() try: translation.activate(settings.LANGUAGE_CODE) parsed = render_to_string('tutorialv2/export/content.md', {'content': versioned}) @@ -641,6 +664,8 @@ def publish_content(db_object, versioned, is_major_update=True): # save public version if is_major_update or not is_update: public_version.publication_date = datetime.now() + elif is_update: + public_version.update_date = datetime.now() public_version.sha_public = versioned.current_version public_version.save() @@ -714,7 +739,7 @@ def __init__(self, *args, **kwargs): super(BadManifestError, self).__init__(*args, **kwargs) -def get_content_from_json(json, sha, slug_last_draft, public=False): +def get_content_from_json(json, sha, slug_last_draft, public=False, max_title_len=80): """Transform the JSON formated data into ``VersionedContent`` :param json: JSON data from a `manifest.json` file @@ -727,9 +752,24 @@ def get_content_from_json(json, sha, slug_last_draft, public=False): from zds.tutorialv2.models.models_versioned import Container, Extract, VersionedContent, PublicContent if 'version' in json and json['version'] == 2: + json["version"] = "2" + if not all_is_string_appart_from_children(json): + json['version'] = 2 + raise BadManifestError(_(u"Le fichier manifest n'est pas bien formaté.")) + json['version'] = 2 # create and fill the container - slugify_raise_on_empty(json['title']) - json_slug = slugify_raise_on_empty(json['slug']) + if len(json['title']) > max_title_len: + raise BadManifestError( + _(u"Le titre doit être une chaîne de caractères de moins de {} caractères.").format(max_title_len)) + + # check that title gives correct slug + slugify_raise_on_invalid(json['title']) + + if not check_slug(json['slug']): + raise InvalidSlugError(json['slug']) + else: + json_slug = json['slug'] + if not public: versioned = VersionedContent(sha, 'TUTORIAL', json['title'], json_slug, slug_last_draft) else: @@ -758,6 +798,7 @@ def get_content_from_json(json, sha, slug_last_draft, public=False): fill_containers_from_json(json, versioned) else: # MINIMUM (!) fallback for version 1.0 + if "type" in json: if json['type'] == 'article': _type = 'ARTICLE' @@ -792,16 +833,18 @@ def get_content_from_json(json, sha, slug_last_draft, public=False): else: # it's a tutorial if json['type'] == 'MINI' and 'chapter' in json and 'extracts' in json['chapter']: for extract in json['chapter']['extracts']: - new_extract = Extract(extract['title'], '{}_{}'.format(extract['pk'], - slugify_raise_on_empty(extract['title']))) + new_extract = Extract( + extract['title'], + '{}_{}'.format(extract['pk'], slugify_raise_on_invalid(extract['title'], True))) if 'text' in extract: new_extract.text = extract['text'] versioned.add_extract(new_extract, generate_slug=False) elif json['type'] == 'BIG' and 'parts' in json: for part in json['parts']: - new_part = Container(part['title'], '{}_{}'.format(part['pk'], - slugify_raise_on_empty(part['title']))) + new_part = Container( + part['title'], '{}_{}'.format(part['pk'], slugify_raise_on_invalid(part['title'], True))) + if 'introduction' in part: new_part.introduction = part['introduction'] if 'conclusion' in part: @@ -811,8 +854,9 @@ def get_content_from_json(json, sha, slug_last_draft, public=False): if 'chapters' in part: for chapter in part['chapters']: new_chapter = Container( - chapter['title'], '{}_{}'.format(chapter['pk'], - slugify_raise_on_empty(chapter['title']))) + chapter['title'], + '{}_{}'.format(chapter['pk'], slugify_raise_on_invalid(chapter['title'], True))) + if 'introduction' in chapter: new_chapter.introduction = chapter['introduction'] if 'conclusion' in chapter: @@ -822,8 +866,9 @@ def get_content_from_json(json, sha, slug_last_draft, public=False): if 'extracts' in chapter: for extract in chapter['extracts']: new_extract = Extract( - extract['title'], '{}_{}'.format(extract['pk'], - slugify_raise_on_empty(extract['title']))) + extract['title'], + '{}_{}'.format(extract['pk'], slugify_raise_on_invalid(extract['title'], True))) + if 'text' in extract: new_extract.text = extract['text'] new_chapter.add_extract(new_extract, generate_slug=False) @@ -832,21 +877,70 @@ def get_content_from_json(json, sha, slug_last_draft, public=False): class InvalidSlugError(ValueError): - pass + """ Error raised when a slug is invalid. Argument is the slug that cause the error. + + ``source`` can also be provided, being the sentence from witch the slug was generated, if any. + ``had_source`` is set to ``True`` if the source is provided. + + """ + + def __init__(self, *args, **kwargs): + + self.source = '' + self.had_source = False + + if 'source' in kwargs: + self.source = kwargs.pop('source') + self.had_source = True + super(InvalidSlugError, self).__init__(*args, **kwargs) + + +def check_slug(slug): + """If the title is incorrect (only special chars so slug is empty) + + :param slug: slug to test + :type slug; str + :return: `True` if slug is valid, false otherwise + :rtype: bool + """ + + if not VALID_SLUG.match(slug): + return False + + if slug.replace("-", "").replace("_", "") == "": + return False + + if len(slug) > settings.ZDS_APP['content']['maximum_slug_size']: + return False + + return True + + +def slugify_raise_on_invalid(title, use_old_slugify=False): + """use uuslug to generate a slug but if the title is incorrect (only special chars or slug is empty), an exception + is raised. -def slugify_raise_on_empty(title): - """use uuslug to generate a slug but if the title is incorrect (only special chars so slug is empty)\ - we raise a ValueError :param title: to be slugified title :type title: str - :raise ValueError: on incorrect slug: + :param use_old_slugify: use the function `slugify()` defined in zds.utils instead of the one in uuslug. Usefull + for retro-compatibility with the old article/tutorial module, SHOULD NOT be used for the new one ! + :type use_old_slugify: bool + :raise InvalidSlugError: on incorrect slug: :return: the slugified title :rtype: str """ - slug = slugify(title) - if slug.replace("-", "").replace("_", "") == "": - raise InvalidSlugError("slug is incorrect") + + if not isinstance(title, basestring): + raise InvalidSlugError('', source=title) + if not use_old_slugify: + slug = slugify(title) + else: + slug = old_slugify(title) + + if not check_slug(slug): + raise InvalidSlugError(slug, source=title) + return slug @@ -862,12 +956,18 @@ def fill_containers_from_json(json_sub, parent): from zds.tutorialv2.models.models_versioned import Container, Extract if 'children' in json_sub: + for child in json_sub['children']: + if not all_is_string_appart_from_children(child): + raise BadManifestError( + _(u"Le fichier manifest n'est pas bien formaté dans le conteneur " + str(json_sub['title']))) if child['object'] == 'container': slug = '' try: - slug = slugify_raise_on_empty(child['slug']) - except (ValueError, KeyError): + slug = child['slug'] + if not check_slug(slug): + raise InvalidSlugError(slug) + except KeyError: pass new_container = Container(child['title'], slug) if 'introduction' in child: @@ -883,8 +983,10 @@ def fill_containers_from_json(json_sub, parent): elif child['object'] == 'extract': slug = '' try: - slug = slugify_raise_on_empty(child['slug']) - except (ValueError, KeyError): + slug = child['slug'] + if not check_slug(slug): + raise InvalidSlugError(child['slug']) + except KeyError: pass new_extract = Extract(child['title'], slug) @@ -948,14 +1050,15 @@ def init_new_repo(db_object, introduction_text, conclusion_text, commit_message= def get_commit_author(): - """get a dictionary that represent the commit author with ``author`` and ``comitter`` key + """get a dictionary that represent the commit author with ``author`` and ``comitter`` key. If there is no users, + bot account pk is used. :return: correctly formatted commit author for ``repo.index.commit()`` :rtype: dict """ user = get_current_user() - if user: + if user and user.is_authenticated(): aut_user = str(user.pk) aut_email = None @@ -963,11 +1066,16 @@ def get_commit_author(): aut_email = user.email else: - aut_user = ZDS_APP['member']['bot_account'] + try: + aut_user = str(User.objects.filter(username=settings.ZDS_APP['member']['bot_account']).first().pk) + except AttributeError: + aut_user = '0' + aut_email = None if aut_email is None or aut_email.strip() == "": - aut_email = "inconnu@{}".format(settings.ZDS_APP['site']['dns']) + aut_email = _(u"inconnu@{}").format(settings.ZDS_APP['site']['dns']) + return {'author': Actor(aut_user, aut_email), 'committer': Actor(aut_user, aut_email)} diff --git a/zds/tutorialv2/views/views_contents.py b/zds/tutorialv2/views/views_contents.py index 260bf95d6a..ddca3166d4 100644 --- a/zds/tutorialv2/views/views_contents.py +++ b/zds/tutorialv2/views/views_contents.py @@ -41,9 +41,9 @@ from zds.tutorialv2.utils import search_container_or_404, get_target_tagged_tree, search_extract_or_404, \ try_adopt_new_child, TooDeepContainerError, BadManifestError, get_content_from_json, init_new_repo, \ default_slug_pool, BadArchiveError, InvalidSlugError -from zds.utils import slugify +from uuslug import slugify from zds.utils.forums import send_post, lock_topic, create_topic, unlock_topic -from zds.forum.models import Topic, TopicFollowed, follow, mark_read +from zds.forum.models import Topic, follow, mark_read from zds.utils.models import Tag, HelpWriting from zds.utils.mps import send_mp from zds.utils.paginator import ZdSPagingListView @@ -59,7 +59,7 @@ class RedirectOldBetaTuto(RedirectView): def get_redirect_url(self, **kwargs): tutorial = PublishableContent.objects.filter(type="TUTORIAL", old_pk=kwargs["pk"]).first() if tutorial is None or tutorial.sha_beta is None or tutorial.sha_beta == "": - raise Http404("No beta content has this old pk") + raise Http404(_(u"Aucun contenu en bêta trouvé avec cet ancien identifiant.")) return tutorial.get_absolute_url_beta() @@ -107,7 +107,7 @@ def form_valid(self, form): img.physical = self.request.FILES["image"] img.gallery = gal img.title = self.request.FILES["image"] - img.slug = slugify(self.request.FILES["image"]) + img.slug = slugify(self.request.FILES["image"].name) img.pubdate = datetime.now() img.save() self.content.image = img @@ -202,7 +202,7 @@ def get_object(self, queryset=None): obj = super(DisplayBetaContent, self).get_object(queryset) if not obj.sha_beta or obj.sha_beta == '': - raise Http404("There is no beta version.") + raise Http404(_(u"Aucune bêta n'existe pour ce contenu.")) else: self.sha = obj.sha_beta @@ -288,7 +288,7 @@ def form_valid(self, form): img.physical = self.request.FILES["image"] img.gallery = publishable.gallery img.title = self.request.FILES["image"] - img.slug = slugify(self.request.FILES["image"]) + img.slug = slugify(self.request.FILES["image"].name) img.pubdate = datetime.now() img.save() publishable.image = img @@ -345,14 +345,14 @@ def delete(self, request, *args, **kwargs): if self.object.authors.count() > 1: # if more than one author, just remove author from list RemoveAuthorFromContent.remove_author(self.object, self.request.user) - messages.success(self.request, _(u'Vous avez quitté la rédaction de {}').format(_type)) + messages.success(self.request, _(u'Vous avez quitté la rédaction de {}.').format(_type)) else: validation = Validation.objects.filter(content=self.object).order_by("-date_proposition").first() if validation and validation.status == 'PENDING_V': # if the validation have a validator, warn him by PM if 'text' not in self.request.POST or len(self.request.POST['text'].strip()) < 3: - messages.error(self.request, 'Merci de fournir une raison à la suppression.') + messages.error(self.request, _(u'Merci de fournir une raison à la suppression.')) return redirect(self.object.get_absolute_url()) else: bot = get_object_or_404(User, username=settings.ZDS_APP['member']['bot_account']) @@ -388,7 +388,7 @@ def delete(self, request, *args, **kwargs): self.object.delete() - messages.success(self.request, _(u'Vous avez bien supprimé {}').format(_type)) + messages.success(self.request, _(u'Vous avez bien supprimé {}.').format(_type)) return redirect(reverse('content:find-' + object_type, args=[request.user.pk])) @@ -494,7 +494,7 @@ def extract_content_from_zip(zip_archive): except KeyError: raise BadArchiveError(_(u'Cette archive ne contient pas de fichier manifest.json.')) except UnicodeDecodeError: - raise BadArchiveError(_(u'L\'encodage du manifest.json n\'est pas de l\'UTF-8')) + raise BadArchiveError(_(u'L\'encodage du manifest.json n\'est pas de l\'UTF-8.')) # is the manifest ok ? try: @@ -502,15 +502,20 @@ def extract_content_from_zip(zip_archive): except ValueError: raise BadArchiveError( _(u'Une erreur est survenue durant la lecture du manifest, ' - u'vérifiez qu\'il s\'agit de JSON correctement formaté')) + u'vérifiez qu\'il s\'agit de JSON correctement formaté.')) try: - versioned = get_content_from_json(json_, None, '') + versioned = get_content_from_json(json_, None, '', + max_title_len=PublishableContent._meta.get_field('title').max_length) except BadManifestError as e: raise BadArchiveError(e.message) - except InvalidSlugError: - raise BadArchiveError(_(u'Le titre et le slug doivent être bien formés (au moins une lettre).')) + except InvalidSlugError as e: + e1 = _(u'Le slug "{}" est invalide').format(e) + e2 = u'' + if e.had_source: + e2 = _(u' (slug généré à partir de "{}")').format(e.source) + raise BadArchiveError(_(u'{}{} !').format(e1, e2)) except Exception as e: - raise BadArchiveError(_(u'Une erreur est survenue lors de la lecture de l\'archive : ' + e.message)) + raise BadArchiveError(_(u'Une erreur est survenue lors de la lecture de l\'archive : {}.').format(e)) # is there everything in the archive ? for f in UpdateContentWithArchive.walk_content(versioned): @@ -553,7 +558,7 @@ def update_from_new_version_in_zip(copy_to, copy_from, zip_file): raise BadArchiveError( _(u'Le fichier « {} » n\'est pas encodé en UTF-8'.format(child.conclusion))) - copy_to.repo_add_container(child.title, introduction, conclusion, do_commit=False) + copy_to.repo_add_container(child.title, introduction, conclusion, do_commit=False, slug=child.slug) UpdateContentWithArchive.update_from_new_version_in_zip(copy_to.children[-1], child, zip_file) elif isinstance(child, Extract): @@ -563,7 +568,7 @@ def update_from_new_version_in_zip(copy_to, copy_from, zip_file): raise BadArchiveError( _(u'Le fichier « {} » n\'est pas encodé en UTF-8'.format(child.text))) - copy_to.repo_add_extract(child.title, text, do_commit=False) + copy_to.repo_add_extract(child.title, text, do_commit=False, slug=child.slug) @staticmethod def use_images_from_archive(request, zip_file, versioned_content, gallery): @@ -678,7 +683,7 @@ def form_valid(self, form): try: zfile = zipfile.ZipFile(self.request.FILES['archive'], "r") except zipfile.BadZipfile: - messages.error(self.request, _(u'Cette archive n\'est pas au format ZIP')) + messages.error(self.request, _(u'Cette archive n\'est pas au format ZIP.')) return super(UpdateContentWithArchive, self).form_invalid(form) try: @@ -692,7 +697,7 @@ def form_valid(self, form): manifest = json_reader.loads(unicode(zfile.read('manifest.json'), 'utf-8')) if 'licence' not in manifest or manifest['licence'] != new_version.licence.code: messages.info( - self.request, _(u'la licence « {} » a été appliquée'.format(new_version.licence.code))) + self.request, _(u'la licence « {} » a été appliquée.').format(new_version.licence.code)) # first, update DB object (in order to get a new slug if needed) self.object.title = new_version.title @@ -751,7 +756,7 @@ def form_valid(self, form): try: zfile = zipfile.ZipFile(self.request.FILES["image_archive"], "r") except zipfile.BadZipfile: - messages.error(self.request, _(u'L\'archive contenant les images n\'est pas au format ZIP')) + messages.error(self.request, _(u'L\'archive contenant les images n\'est pas au format ZIP.')) return self.form_invalid(form) UpdateContentWithArchive.use_images_from_archive( @@ -786,7 +791,7 @@ def form_valid(self, form): try: zfile = zipfile.ZipFile(self.request.FILES['archive'], "r") except zipfile.BadZipfile: - messages.error(self.request, _(u'Cette archive n\'est pas au format ZIP')) + messages.error(self.request, _(u'Cette archive n\'est pas au format ZIP.')) return self.form_invalid(form) try: @@ -803,7 +808,7 @@ def form_valid(self, form): manifest = json_reader.loads(unicode(zfile.read('manifest.json'), 'utf-8')) if 'licence' not in manifest or manifest['licence'] != new_content.licence.code: messages.info( - self.request, _(u'la licence « {} » a été appliquée'.format(new_content.licence.code))) + self.request, _(u'la licence « {} » a été appliquée.'.format(new_content.licence.code))) # first, create DB object (in order to get a slug) self.object = PublishableContent() @@ -874,7 +879,7 @@ def form_valid(self, form): try: zfile = zipfile.ZipFile(self.request.FILES["image_archive"], "r") except zipfile.BadZipfile: - messages.error(self.request, _(u'L\'archive contenant les images n\'est pas au format ZIP')) + messages.error(self.request, _(u'L\'archive contenant les images n\'est pas au format ZIP.')) return self.form_invalid(form) UpdateContentWithArchive.use_images_from_archive( @@ -912,7 +917,7 @@ def get_context_data(self, **kwargs): def render_to_response(self, context, **response_kwargs): parent = context['container'] if not parent.can_add_container(): - messages.error(self.request, _(u'Vous ne pouvez plus ajouter de conteneur à « {} »').format(parent.title)) + messages.error(self.request, _(u'Vous ne pouvez plus ajouter de conteneur à « {} ».').format(parent.title)) return redirect(parent.get_absolute_url()) return super(CreateContainer, self).render_to_response(context, **response_kwargs) @@ -995,7 +1000,7 @@ def get_object(self, queryset=None): obj = super(DisplayBetaContainer, self).get_object(queryset) if not obj.sha_beta or obj.sha_beta == '': - raise Http404("There is no beta version.") + raise Http404(_(u"Aucune bêta n'existe pour ce contenu.")) else: self.sha = obj.sha_beta @@ -1091,7 +1096,7 @@ def get_context_data(self, **kwargs): def render_to_response(self, context, **response_kwargs): parent = context['container'] if not parent.can_add_extract(): - messages.error(self.request, _(u'Vous ne pouvez plus ajouter de section à « {} »').format(parent.title)) + messages.error(self.request, _(u'Vous ne pouvez plus ajouter de section à « {} ».').format(parent.title)) return redirect(parent.get_absolute_url()) return super(CreateExtract, self).render_to_response(context, **response_kwargs) @@ -1191,7 +1196,7 @@ def delete(self, request, *args, **kwargs): try: to_delete = parent.children_dict[self.kwargs['object_slug']] except KeyError: - raise Http404("Cannot find the object to delete.") + raise Http404(_(u"Impossible de récupérer le contenu pour le supprimer.")) sha = to_delete.repo_delete() @@ -1240,9 +1245,9 @@ def get_context_data(self, **kwargs): context = super(DisplayDiff, self).get_context_data(**kwargs) if 'from' not in self.request.GET: - raise Http404("Missing 'from' GET parameter") + raise Http404(_(u"Paramètre GET 'from' manquant.")) if 'to' not in self.request.GET: - raise Http404("Missing 'to' GET parameter") + raise Http404(u"Paramètre GET 'to' manquant.") # open git repo and find diff between two versions repo = self.versioned_object.repository @@ -1279,6 +1284,45 @@ class ManageBetaContent(LoggedWithReadWriteHability, SingleContentFormViewMixin) action = None + def _get_all_tags(self): + all_tags = [] + categories = self.object.subcategory.all() + names = [smart_text(category.title).lower() for category in categories] + existing_tags = Tag.objects.filter(title__in=names).all() + existing_tags_names = [tag.title for tag in existing_tags] + unexisting_tags = list(set(names) - set(existing_tags_names)) + for tag in unexisting_tags: + new_tag = Tag() + new_tag.title = tag[:20] + new_tag.save() + all_tags.append(new_tag) + all_tags += existing_tags + return all_tags + + def _create_beta_topic(self, msg, beta_version, _type, tags): + topic_title = beta_version.title + tags = "[beta][{}]".format(_type) + i = 0 + while len(topic_title) + len(tags) + len(tags[i]) + 2 < Topic._meta.get_field("title").max_length: + tags += '[{}]'.format(tags[i]) + i += 1 + forum = get_object_or_404(Forum, pk=settings.ZDS_APP['forum']['beta_forum_id']) + topic = create_topic(request=self.request, + author=self.request.user, + forum=forum, + title=topic_title, + subtitle=u"{}".format(beta_version.description), + text=msg, + related_publishable_content=self.object) + topic.save() + # make all authors follow the topic: + for author in self.object.authors.all(): + if not topic.is_followed(author): + follow(topic, author) + mark_read(topic, author) + + return topic + @method_decorator(transaction.atomic) def dispatch(self, *args, **kwargs): return super(ManageBetaContent, self).dispatch(*args, **kwargs) @@ -1329,37 +1373,10 @@ def form_valid(self, form): if not topic: # if first time putting the content in beta, send a message on the forum and a PM - forum = get_object_or_404(Forum, pk=settings.ZDS_APP['forum']['beta_forum_id']) # find tags - # TODO: make a util's function of it - categories = self.object.subcategory.all() - names = [smart_text(category.title).lower() for category in categories] - existing_tags = Tag.objects.filter(title__in=names).all() - existing_tags_names = [tag.title for tag in existing_tags] - unexisting_tags = list(set(names) - set(existing_tags_names)) - for tag in unexisting_tags: - new_tag = Tag() - new_tag.title = tag[:20] - new_tag.save() - all_tags.append(new_tag) - all_tags += existing_tags - - topic = create_topic(request=self.request, - author=self.request.user, - forum=forum, - title=_(u"[beta][{}]{}").format(_type, beta_version.title), - subtitle=u"{}".format(beta_version.description), - text=msg, - related_publishable_content=self.object) - - topic = Topic.objects.get(pk=topic.pk) - - # make all authors follow the topic: - for author in self.object.authors.all(): - if author.pk is not self.request.user.pk: - follow(topic, author) - mark_read(topic, author) + all_tags = self._get_all_tags() + topic = self._create_beta_topic(msg, beta_version, _type, all_tags) bot = get_object_or_404(User, username=settings.ZDS_APP['member']['bot_account']) msg_pm = render_to_string( @@ -1367,7 +1384,8 @@ def form_valid(self, form): { 'content': beta_version, 'type': _type, - 'url': settings.ZDS_APP['site']['url'] + topic.get_absolute_url() + 'url': settings.ZDS_APP['site']['url'] + topic.get_absolute_url(), + 'user': self.request.user } ) send_mp(bot, @@ -1377,18 +1395,7 @@ def form_valid(self, form): msg_pm, False) else: - categories = self.object.subcategory.all() - names = [smart_text(category.title).lower() for category in categories] - existing_tags = Tag.objects.filter(title__in=names).all() - existing_tags_names = [tag.title for tag in existing_tags] - unexisting_tags = list(set(names) - set(existing_tags_names)) - all_tags = [] - for tag in unexisting_tags: - new_tag = Tag() - new_tag.title = tag[:20] - new_tag.save() - all_tags.append(new_tag) - all_tags += existing_tags + all_tags = self._get_all_tags() if not already_in_beta: unlock_topic(topic) msg_post = render_to_string( @@ -1412,7 +1419,7 @@ def form_valid(self, form): # make sure that all authors follow the topic: for author in self.object.authors.all(): - if TopicFollowed.objects.filter(topic__pk=topic.pk, user__pk=author.pk).count() == 0: + if not topic.is_followed(author): follow(topic, author) mark_read(topic, author) @@ -1478,7 +1485,7 @@ def form_valid(self, form): if form.content.is_public: is_public = True elif not form.content.is_beta: - raise Http404("The content is not public nor in beta.") + raise Http404(_(u"Le contenu n'est ni public, ni en bêta.")) if len(authors) == 0: if self.object.authors.count() > 1: @@ -1592,10 +1599,10 @@ def form_valid(self, form): child_slug = form.data['child_slug'] if base_container_slug == '': - raise Http404("The slug of the base container is empty.") + raise Http404(_(u"Le slug du container de base est vide.")) if child_slug == '': - raise Http404("The slug of the child is empty.") + raise Http404(_(u"Le slug du container enfant est vide.")) if base_container_slug == versioned.slug: parent = versioned @@ -1624,7 +1631,7 @@ def form_valid(self, form): target_parent = search_container_or_404(versioned, "/".join(target.split("/")[:-1])) if target.split("/")[-1] not in target_parent.children_dict: - raise Http404("The target is not a child of its parent.") + raise Http404(_(u"La cible n'est pas un enfant du parent.")) child = target_parent.children_dict[target.split("/")[-1]] try_adopt_new_child(target_parent, parent.children_dict[child_slug]) # now, I will fix a bug that happens when the slug changes @@ -1643,7 +1650,7 @@ def form_valid(self, form): target_parent = search_container_or_404(versioned, "/".join(target.split("/")[:-1])) if target.split("/")[-1] not in target_parent.children_dict: - raise Http404("The target is not a child of its parent.") + raise Http404(_(u"La cible n'est pas un enfant du parent.")) child = target_parent.children_dict[target.split("/")[-1]] try_adopt_new_child(target_parent, parent.children_dict[child_slug]) # now, I will fix a bug that happens when the slug changes @@ -1667,7 +1674,7 @@ def form_valid(self, form): messages.warning(self.request, _(u"Vous n'avez pas complètement rempli le formulaire," u"ou bien il est impossible de déplacer cet élément.")) except ValueError as e: - raise Http404("The specified tree is invalid." + str(e)) + raise Http404(_(u"L'arbre spécifié n'est pas valide." + str(e))) except IndexError: messages.warning(self.request, _(u"L'élément se situe déjà à la place souhaitée.")) except TypeError: @@ -1785,10 +1792,10 @@ def form_valid(self, form): if not current_user: # if the removed author is not current user messages.success( - self.request, _(u'Vous avez enlevé {} de la liste des auteurs de {}').format(authors_list, _type)) + self.request, _(u'Vous avez enlevé {} de la liste des auteurs de « {} ».').format(authors_list, _type)) self.success_url = self.object.get_absolute_url() else: # if current user is leaving the content's redaction, redirect him to a more suitable page - messages.success(self.request, _(u'Vous avez bien quitté la rédaction de {}').format(_type)) + messages.success(self.request, _(u'Vous avez bien quitté la rédaction de « {} ».').format(_type)) self.success_url = reverse('content:find-' + self.object.type.lower(), args=[self.request.user.pk]) self.already_finished = True # this one is kind of tricky : because of inheritance we used to force redirection # to the content itself. This does not please me but I think it is better to do that like that instead of @@ -1828,14 +1835,14 @@ def dispatch(self, request, *args, **kwargs): if not self.authorized_filters[filter_][2]: raise PermissionDenied else: - raise Http404("The filter is not authorized.") + raise Http404(_(u"Le filtre n'est pas autorisé.")) return super(ContentOfAuthor, self).dispatch(request, *args, **kwargs) def get_queryset(self): if self.type in TYPE_CHOICES_DICT.keys(): queryset = PublishableContent.objects.filter(authors__pk__in=[self.user.pk], type=self.type) else: - raise Http404("This type of content is unknown") + raise Http404(_(u"Ce type de contenu est inconnu dans le système.")) # prefetch: queryset = queryset\ @@ -1848,7 +1855,7 @@ def get_queryset(self): if 'filter' in self.request.GET: self.filter = self.request.GET['filter'].lower() if self.filter not in self.authorized_filters: - raise Http404("The filter is not authorized.") + raise Http404(_(u"Le filtre n'est pas autorisé.")) elif self.user != self.request.user: self.filter = 'public' if self.filter != '': diff --git a/zds/tutorialv2/views/views_published.py b/zds/tutorialv2/views/views_published.py index 0f48b01ad8..b73479ff06 100644 --- a/zds/tutorialv2/views/views_published.py +++ b/zds/tutorialv2/views/views_published.py @@ -20,7 +20,7 @@ from zds.tutorialv2.mixins import SingleOnlineContentDetailViewMixin, SingleOnlineContentViewMixin, DownloadViewMixin, \ ContentTypeMixin, SingleOnlineContentFormViewMixin, MustRedirect from zds.tutorialv2.models.models_database import PublishableContent, PublishedContent, ContentReaction -from zds.tutorialv2.utils import search_container_or_404, never_read, mark_read +from zds.tutorialv2.utils import search_container_or_404, mark_read, last_participation_is_old from zds.utils.models import CommentDislike, CommentLike, SubCategory, Alert from zds.utils.mps import send_mp from zds.utils.paginator import make_pagination, ZdSPagingListView @@ -35,7 +35,7 @@ def get_redirect_url(self, **kwargs): """Redirects the user to the new url""" obj = PublishableContent.objects.get(old_pk=int(kwargs["pk"]), type="TUTORIAL") if obj is None or not obj.in_public(): - raise Http404("No public object has this pk.") + raise Http404(_(u"Aucun contenu public n'est disponible avec cet identifiant.")) kwargs["parent_container_slug"] = str(kwargs["p2"]) + "_" + kwargs["parent_container_slug"] kwargs["container_slug"] = str(kwargs["p3"]) + "_" + kwargs["container_slug"] obj = search_container_or_404(obj.load_version(public=True), kwargs) @@ -57,8 +57,6 @@ def get_context_data(self, **kwargs): """Show the given tutorial if exists.""" context = super(DisplayOnlineContent, self).get_context_data(**kwargs) - # TODO: deal with messaging and stuff like this !! - if context['is_staff']: context['formRevokeValidation'] = RevokeValidationForm( self.versioned_object, initial={'version': self.versioned_object.sha_public}) @@ -137,7 +135,7 @@ def get_context_data(self, **kwargs): context['isantispam'] = self.object.antispam() # handle reactions: - if never_read(self.object): + if last_participation_is_old(self.object, self.request.user): mark_read(self.object) return context @@ -188,15 +186,15 @@ def get(self, context, **response_kwargs): # check that type is ok if self.requested_file not in self.allowed_types: - raise Http404("The type of the file is not allowed.") + raise Http404(_(u"Le type du fichier n'est pas permis.")) # check existence if not self.public_content_object.have_type(self.requested_file): - raise Http404("The type does not exist.") + raise Http404(_(u"Le type n'existe pas.")) if self.requested_file == 'md' and not self.is_author and not self.is_staff: # download markdown is only for staff and author - raise Http404("Only staff and author can download Markdown.") + raise Http404(_(u"Seul le staff et l'auteur peuvent télécharger la version Markdown du contenu.")) # set mimetype accordingly self.mimetype = self.mimetypes[self.requested_file] @@ -215,7 +213,7 @@ def get_contents(self): try: response = open(path, 'rb').read() except IOError: - raise Http404("The file does not exist.") + raise Http404(_(u"Le fichier n'existe pas.")) return response @@ -362,11 +360,14 @@ def get(self, request, *args, **kwargs): try: cited_pk = int(self.request.GET["cite"]) except ValueError: - raise Http404('The `cite` argument must be an integer') + raise Http404(_(u'L\'argument `cite` doit être un entier.')) reaction = ContentReaction.objects.filter(pk=cited_pk).first() if reaction: + if not reaction.is_visible: + raise PermissionDenied + text = '\n'.join('> ' + line for line in reaction.text.split('\n')) text += "\nSource: [{}]({})".format(reaction.author.username, reaction.get_absolute_url()) @@ -374,8 +375,11 @@ def get(self, request, *args, **kwargs): return StreamingHttpResponse(json_writer.dumps({"text": text}, ensure_ascii=False)) else: self.quoted_reaction_text = text - - return super(SendNoteFormView, self).get(request, *args, **kwargs) + try: + return super(SendNoteFormView, self).get(request, *args, **kwargs) + except MustRedirect: # if someone changed the pk arguments, and reached a "must redirect" public + # object + raise Http404(_(u"Aucun contenu public trouvé avec l'identifiant " + str(self.request.GET.get("pk", 0)))) def post(self, request, *args, **kwargs): @@ -439,9 +443,14 @@ def get_form_kwargs(self): .prefetch_related("author")\ .filter(pk=int(self.request.GET["message"]))\ .first() + if not self.reaction: + raise Http404(_(u"Aucune réaction : " + self.request.GET["message"])) + if self.reaction.author.pk != self.request.user.pk and not self.is_staff: + raise PermissionDenied() + kwargs['reaction'] = self.reaction else: - raise Http404("The 'message' parameter must be a digit.") + raise Http404(_(u"Le paramètre 'message' doit être un digit.")) return kwargs @@ -471,12 +480,12 @@ def form_valid(self, form): .filter(pk=int(self.request.GET["message"]))\ .first() if self.reaction is None: - raise Http404("There is no reaction.") + raise Http404(_(u"Il n'y a aucune réaction.")) if self.reaction.author != self.request.user: if not self.request.user.has_perm('tutorialv2.change_contentreaction'): raise PermissionDenied else: - messages.error(self.request, 'Oh non ! Une erreur est survenue dans la requête !') + messages.error(self.request, _(u'Oh non ! Une erreur est survenue dans la requête !')) return self.form_invalid(form) return super(UpdateNoteView, self).form_valid(form) @@ -506,7 +515,7 @@ class UpvoteReaction(LoginRequiredMixin, FormView): def post(self, request, *args, **kwargs): if "message" not in self.request.GET or not self.request.GET["message"].isdigit(): - raise Http404("The 'message' parameter must be a digit.") + raise Http404(_(u"Le paramètre 'message' doit être un digit.")) note_pk = int(self.request.GET["message"]) note = get_object_or_404(ContentReaction, pk=note_pk) resp = {} @@ -573,7 +582,7 @@ def post(self, request, *args, **kwargs): reaction.hide_comment_by_user(self.request.user, text) return redirect(reaction.get_absolute_url()) except (IndexError, ValueError, MultiValueDictKeyError): - raise Http404("You cannot hide this.") + raise Http404(_(u"Vous ne pouvez pas cacher cette réaction.")) class ShowReaction(FormView, LoggedWithReadWriteHability, PermissionRequiredMixin): @@ -595,7 +604,7 @@ def post(self, request, *args, **kwargs): return redirect(reaction.get_absolute_url()) except (IndexError, ValueError, MultiValueDictKeyError): - raise Http404("No such thing to show.") + raise Http404(_(u"Aucune réaction trouvée.")) class SendNoteAlert(FormView, LoginRequiredMixin): @@ -609,7 +618,7 @@ def post(self, request, *args, **kwargs): try: note_pk = int(self.kwargs["pk"]) except (KeyError, ValueError): - raise Http404("Cannot convert the pk into int.") + raise Http404(_(u"Impossible de convertir l'identifiant en entier.")) note = get_object_or_404(ContentReaction, pk=note_pk) alert = Alert() alert.author = request.user @@ -619,7 +628,7 @@ def post(self, request, *args, **kwargs): alert.pubdate = datetime.now() alert.save() - messages.success(self.request, _(u"Ce commentaire a bien été signalé aux modérateurs")) + messages.success(self.request, _(u"Ce commentaire a bien été signalé aux modérateurs.")) return redirect(note.get_absolute_url()) @@ -673,7 +682,7 @@ def post(self, request, *args, **kwargs): alert = get_object_or_404(Alert, pk=int(request.POST["alert_pk"])) note = ContentReaction.objects.get(pk=alert.comment.id) except (KeyError, ValueError): - raise Http404("The alert does not exist.") + raise Http404(_(u"L'alerte n'existe pas.")) text = '' if "text" in request.POST and request.POST["text"] != "": diff --git a/zds/tutorialv2/views/views_validations.py b/zds/tutorialv2/views/views_validations.py index 1f810f110f..bc1b550d97 100644 --- a/zds/tutorialv2/views/views_validations.py +++ b/zds/tutorialv2/views/views_validations.py @@ -70,7 +70,7 @@ def get_queryset(self): except KeyError: pass except ValueError: - raise Http404("Invalid format for subcategory parameter") + raise Http404(_(u"Format invalide pour le paramètre de la sous-catégorie.")) return queryset.order_by("date_proposition").all() @@ -119,7 +119,6 @@ def form_valid(self, form): # warn the former validator that an update has been made, if any if old_validator: validation.validator = old_validator - # TODO: why not let the validator be the same using PENDING_V ? bot = get_object_or_404(User, username=settings.ZDS_APP['member']['bot_account']) msg = render_to_string( @@ -342,7 +341,7 @@ class AcceptValidation(LoginRequiredMixin, PermissionRequiredMixin, ModalFormVie modal_form = True def get(self, request, *args, **kwargs): - raise Http404("Validation acceptance is not reachable with GET method") + raise Http404(_(u"Publier un contenu depuis la validation n'est pas disponible en GET.")) def get_form_kwargs(self): kwargs = super(AcceptValidation, self).get_form_kwargs()