From 62230fcfdb794aba5a64899b76862c51ab771d4d Mon Sep 17 00:00:00 2001 From: artragis Date: Sat, 26 Sep 2015 18:45:44 +0200 Subject: [PATCH 01/55] =?UTF-8?q?Permet=20de=20migrer=20tout=20le=20monde?= =?UTF-8?q?=20m=C3=AAme=20quand=20un=20tuto=20foire.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit avec try/catch + trace dans la sortie standard (print) --- .../management/commands/migrate_to_zep12.py | 224 +++++++++--------- 1 file changed, 114 insertions(+), 110 deletions(-) diff --git a/zds/tutorialv2/management/commands/migrate_to_zep12.py b/zds/tutorialv2/management/commands/migrate_to_zep12.py index 0a9b1a3961..b53c28b54d 100644 --- a/zds/tutorialv2/management/commands/migrate_to_zep12.py +++ b/zds/tutorialv2/management/commands/migrate_to_zep12.py @@ -378,125 +378,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 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() - if clean_commit: - exported.sha_draft = clean_commit + 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 - # save clean up in old module to avoid any trouble - current.sha_draft = clean_commit - current.save() + if clean_commit: + exported.sha_draft = clean_commit - 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() + # save clean up in old module to avoid any trouble + current.sha_draft = clean_commit + current.save() - # now, re create the manifest.json - versioned = exported.load_version() + 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() - # 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 + # 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 - 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") + 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() - # 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.old_pk = current.pk 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() + # 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() + 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 From 69c09b54f211672eaccd5c7087139d7eed9e1f78 Mon Sep 17 00:00:00 2001 From: Eskimon Date: Sun, 27 Sep 2015 23:21:41 +0200 Subject: [PATCH 02/55] =?UTF-8?q?Met=20=C3=A0=20jour=20pillow=20pour=20des?= =?UTF-8?q?=20raisons=20de=20debian8=20et=20libjpeg?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 65ce993765bd651b354a6ce78ef19259f5276320 Mon Sep 17 00:00:00 2001 From: Eskimon Date: Mon, 28 Sep 2015 10:50:12 +0200 Subject: [PATCH 03/55] Fix template since latex update --- assets/tex/template.tex | 3 +++ 1 file changed, 3 insertions(+) diff --git a/assets/tex/template.tex b/assets/tex/template.tex index 8c98f8d726..927cded407 100644 --- a/assets/tex/template.tex +++ b/assets/tex/template.tex @@ -16,6 +16,9 @@ $endif$ \else % if luatex or xelatex \ifxetex + % This will have to be removed some day : http://tex.stackexchange.com/questions/269786/unicode-math-broken + \expandafter\let\csname xetex_suppressfontnotfounderror:D\endcsname + \suppressfontnotfounderror \usepackage{mathspec} \usepackage{xltxtra,xunicode} \else From abf0b544e8bc09c34f7a3cea6a445ca3a94e0e7a Mon Sep 17 00:00:00 2001 From: Eskimon Date: Mon, 28 Sep 2015 11:01:16 +0200 Subject: [PATCH 04/55] Fix install doc for libjpeg --- doc/source/install/backend-linux-install.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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` From be7b17faab4b721a59bf4f3187fcc27a091c6f25 Mon Sep 17 00:00:00 2001 From: Eskimon Date: Mon, 28 Sep 2015 11:48:57 +0200 Subject: [PATCH 05/55] Fix some stuff in deploy script --- scripts/deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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/ From 263b09238ac8e001a2a38a059d5ad2c3abd67306 Mon Sep 17 00:00:00 2001 From: Eskimon Date: Mon, 28 Sep 2015 12:52:18 +0200 Subject: [PATCH 06/55] =?UTF-8?q?Ajoute=20des=20migrations=20oubli=C3=A9es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migrations/0003_auto_20150928_1249.py | 22 +++++++++++++++++++ .../migrations/0002_auto_20150928_1249.py | 21 ++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 zds/gallery/migrations/0003_auto_20150928_1249.py create mode 100644 zds/tutorial/migrations/0002_auto_20150928_1249.py 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/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, + ), + ] From 8ababfb66187533e3792d9dd2a189a1320ef1b2c Mon Sep 17 00:00:00 2001 From: artragis Date: Mon, 28 Sep 2015 20:59:47 +0200 Subject: [PATCH 07/55] =?UTF-8?q?Fix=20#3009=20:=20une=20mauvaise=20pk=20g?= =?UTF-8?q?=C3=A9n=C3=A8re=20une=20500?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zds/tutorialv2/views/views_published.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/zds/tutorialv2/views/views_published.py b/zds/tutorialv2/views/views_published.py index 0f48b01ad8..bc2209b3d4 100644 --- a/zds/tutorialv2/views/views_published.py +++ b/zds/tutorialv2/views/views_published.py @@ -374,8 +374,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("Not found public content with pk " + str(self.request.GET.get("pk", 0))) def post(self, request, *args, **kwargs): From ab17cb79cf41ae49f24818aa262031b6e31472e0 Mon Sep 17 00:00:00 2001 From: artragis Date: Tue, 29 Sep 2015 20:06:25 +0200 Subject: [PATCH 08/55] =?UTF-8?q?rend=20le=20follow=20=C3=A0=20l'auteur=20?= =?UTF-8?q?de=20la=20b=C3=A9ta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zds/tutorialv2/views/views_contents.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zds/tutorialv2/views/views_contents.py b/zds/tutorialv2/views/views_contents.py index 260bf95d6a..d724af813a 100644 --- a/zds/tutorialv2/views/views_contents.py +++ b/zds/tutorialv2/views/views_contents.py @@ -1359,7 +1359,7 @@ def form_valid(self, form): for author in self.object.authors.all(): if author.pk is not self.request.user.pk: follow(topic, author) - mark_read(topic, author) + mark_read(topic, author) bot = get_object_or_404(User, username=settings.ZDS_APP['member']['bot_account']) msg_pm = render_to_string( From c167b1f1e2d1b52eb8191d8372d2d7552454c4d7 Mon Sep 17 00:00:00 2001 From: artragis Date: Tue, 29 Sep 2015 20:20:35 +0200 Subject: [PATCH 09/55] ajoute un TU --- zds/tutorialv2/tests/tests_views.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/zds/tutorialv2/tests/tests_views.py b/zds/tutorialv2/tests/tests_views.py index f3149d74c6..9ceedfc8e5 100644 --- a/zds/tutorialv2/tests/tests_views.py +++ b/zds/tutorialv2/tests/tests_views.py @@ -2656,8 +2656,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 From 2bbd942b1a28eb105ad830cfd58d90d2438146b7 Mon Sep 17 00:00:00 2001 From: pierre-24 Date: Tue, 29 Sep 2015 20:53:12 +0200 Subject: [PATCH 10/55] =?UTF-8?q?Rend=20impossible=20de=20citer=20un=20tex?= =?UTF-8?q?te=20cach=C3=A9=20!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zds/tutorialv2/tests/tests_views.py | 17 +++++++++++++++++ zds/tutorialv2/views/views_published.py | 3 +++ 2 files changed, 20 insertions(+) diff --git a/zds/tutorialv2/tests/tests_views.py b/zds/tutorialv2/tests/tests_views.py index f3149d74c6..e27a5dc2ac 100644 --- a/zds/tutorialv2/tests/tests_views.py +++ b/zds/tutorialv2/tests/tests_views.py @@ -4321,7 +4321,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) diff --git a/zds/tutorialv2/views/views_published.py b/zds/tutorialv2/views/views_published.py index bc2209b3d4..346807dfd3 100644 --- a/zds/tutorialv2/views/views_published.py +++ b/zds/tutorialv2/views/views_published.py @@ -366,6 +366,9 @@ def get(self, request, *args, **kwargs): reaction = ContentReaction.objects.filter(pk=cited_pk).first() + if not reaction.is_visible: + raise PermissionDenied + if reaction: text = '\n'.join('> ' + line for line in reaction.text.split('\n')) text += "\nSource: [{}]({})".format(reaction.author.username, reaction.get_absolute_url()) From 3109d361c709c8e0f4d6da8b98de24ab80c0a20f Mon Sep 17 00:00:00 2001 From: pierre-24 Date: Tue, 29 Sep 2015 21:15:56 +0200 Subject: [PATCH 11/55] =?UTF-8?q?Utilise=20syst=C3=A9matiquement=20la=20fo?= =?UTF-8?q?nction=20`slugify`=20de=20`uuslug`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (pour éviter les incohérences dans le module, même si la rétro-compatibilité est assurée) --- .../management/commands/migrate_to_zep12.py | 2 +- .../commands/upgrade_manifest_to_v2.py | 2 +- zds/tutorialv2/models/models_versioned.py | 2 +- zds/tutorialv2/tests/tests_views.py | 16 ++++- zds/tutorialv2/utils.py | 67 ++++++++++++++----- zds/tutorialv2/views/views_contents.py | 2 +- 6 files changed, 69 insertions(+), 22 deletions(-) diff --git a/zds/tutorialv2/management/commands/migrate_to_zep12.py b/zds/tutorialv2/management/commands/migrate_to_zep12.py index b53c28b54d..dad70ef1e2 100644 --- a/zds/tutorialv2/management/commands/migrate_to_zep12.py +++ b/zds/tutorialv2/management/commands/migrate_to_zep12.py @@ -26,7 +26,7 @@ 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 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/models/models_versioned.py b/zds/tutorialv2/models/models_versioned.py index e9edc4f8f7..433e57419b 100644 --- a/zds/tutorialv2/models/models_versioned.py +++ b/zds/tutorialv2/models/models_versioned.py @@ -12,7 +12,7 @@ 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 diff --git a/zds/tutorialv2/tests/tests_views.py b/zds/tutorialv2/tests/tests_views.py index f3149d74c6..02737092e2 100644 --- a/zds/tutorialv2/tests/tests_views.py +++ b/zds/tutorialv2/tests/tests_views.py @@ -3602,7 +3602,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 +3611,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']): diff --git a/zds/tutorialv2/utils.py b/zds/tutorialv2/utils.py index dca6c877ed..5c369fdf63 100644 --- a/zds/tutorialv2/utils.py +++ b/zds/tutorialv2/utils.py @@ -24,7 +24,9 @@ from zds.tutorialv2 import REPLACE_IMAGE_PATTERN 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 @@ -792,16 +794,17 @@ 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_empty(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_empty(part['title'], True))) + if 'introduction' in part: new_part.introduction = part['introduction'] if 'conclusion' in part: @@ -811,8 +814,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_empty(chapter['title'], True))) + if 'introduction' in chapter: new_chapter.introduction = chapter['introduction'] if 'conclusion' in chapter: @@ -822,8 +826,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_empty(extract['title'], True))) + if 'text' in extract: new_extract.text = extract['text'] new_chapter.add_extract(new_extract, generate_slug=False) @@ -835,18 +840,42 @@ class InvalidSlugError(ValueError): pass -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 +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 slug.replace("-", "").replace("_", "") == "": + return False + + return True + + +def slugify_raise_on_empty(title, use_old_slugify=False): + """use uuslug to generate a slug but if the title is incorrect (only special chars so slug is empty), an exception + is raised + :param title: to be slugified title :type title: str + :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 ValueError: on incorrect slug: :return: the slugified title :rtype: str """ - slug = slugify(title) - if slug.replace("-", "").replace("_", "") == "": - raise InvalidSlugError("slug is incorrect") + + if not use_old_slugify: + slug = slugify(title) + else: + slug = old_slugify(title) + + if not check_slug(slug): + raise InvalidSlugError(slug) + return slug @@ -866,7 +895,9 @@ def fill_containers_from_json(json_sub, parent): if child['object'] == 'container': slug = '' try: - slug = slugify_raise_on_empty(child['slug']) + slug = child['slug'] + if not check_slug(slug): + raise InvalidSlugError(slug) except (ValueError, KeyError): pass new_container = Container(child['title'], slug) @@ -883,7 +914,9 @@ def fill_containers_from_json(json_sub, parent): elif child['object'] == 'extract': slug = '' try: - slug = slugify_raise_on_empty(child['slug']) + slug = child['slug'] + if not check_slug(slug): + raise InvalidSlugError(slug) except (ValueError, KeyError): pass new_extract = Extract(child['title'], slug) diff --git a/zds/tutorialv2/views/views_contents.py b/zds/tutorialv2/views/views_contents.py index 260bf95d6a..103a30b950 100644 --- a/zds/tutorialv2/views/views_contents.py +++ b/zds/tutorialv2/views/views_contents.py @@ -41,7 +41,7 @@ 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.utils.models import Tag, HelpWriting From 4541383fff15d247e4261b0a04b0c7267a6e410b Mon Sep 17 00:00:00 2001 From: pierre-24 Date: Wed, 30 Sep 2015 21:25:44 +0200 Subject: [PATCH 12/55] =?UTF-8?q?Accc=C3=A8de=20=C3=A0=20l'historique=20?= =?UTF-8?q?=C3=A0=20partir=20de=20n'importe=20quelle=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/tutorialv2/view/content.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" %}
    • From e348326f7a58962451b6833fa9190ef394e6b03d Mon Sep 17 00:00:00 2001 From: Situphen Date: Sun, 27 Sep 2015 19:30:34 +0200 Subject: [PATCH 13/55] Corrige un oubli sur les pages listant tutoriels et articles --- templates/tutorialv2/index.html | 10 ++++++++-- templates/tutorialv2/index_online.html | 5 ++++- 2 files changed, 12 insertions(+), 3 deletions(-) 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 %}

    From 4f2eb05176c350225bbadf3e9105fda5372247ae Mon Sep 17 00:00:00 2001 From: artragis Date: Sat, 3 Oct 2015 09:58:17 +0200 Subject: [PATCH 14/55] =?UTF-8?q?change=20l'url=20pour=20cr=C3=A9er=20un?= =?UTF-8?q?=20article?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit french touch --- zds/tutorialv2/urls/urls_contents.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zds/tutorialv2/urls/urls_contents.py b/zds/tutorialv2/urls/urls_contents.py index 0936aedf7a..5763f59646 100644 --- a/zds/tutorialv2/urls/urls_contents.py +++ b/zds/tutorialv2/urls/urls_contents.py @@ -58,7 +58,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(), From 2882c371708b875427d10eb9042e370790ec198a Mon Sep 17 00:00:00 2001 From: artragis Date: Sat, 3 Oct 2015 10:01:16 +0200 Subject: [PATCH 15/55] L'utilisateur s'affiche dans le mp de beta --- zds/tutorialv2/views/views_contents.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/zds/tutorialv2/views/views_contents.py b/zds/tutorialv2/views/views_contents.py index 4700e07ec8..8277c192fc 100644 --- a/zds/tutorialv2/views/views_contents.py +++ b/zds/tutorialv2/views/views_contents.py @@ -1367,7 +1367,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, From b17e1782e3a9718a8d986c8085cfc3f70f3396ec Mon Sep 17 00:00:00 2001 From: artragis Date: Sat, 3 Oct 2015 12:03:36 +0200 Subject: [PATCH 16/55] resolve merge conflict --- zds/tutorialv2/tests/tests_utils.py | 22 +++++++++++++++++++++- zds/tutorialv2/utils.py | 11 +++++++++++ zds/tutorialv2/views/views_published.py | 4 ++-- 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/zds/tutorialv2/tests/tests_utils.py b/zds/tutorialv2/tests/tests_utils.py index d64d2ef9c2..804db7ade4 100644 --- a/zds/tutorialv2/tests/tests_utils.py +++ b/zds/tutorialv2/tests/tests_utils.py @@ -16,7 +16,7 @@ PublishedContentFactory from zds.gallery.factories import UserGalleryFactory 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 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 +578,26 @@ 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 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/utils.py b/zds/tutorialv2/utils.py index 5c369fdf63..226e659ef5 100644 --- a/zds/tutorialv2/utils.py +++ b/zds/tutorialv2/utils.py @@ -131,6 +131,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. diff --git a/zds/tutorialv2/views/views_published.py b/zds/tutorialv2/views/views_published.py index 346807dfd3..1f74ca6f3e 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 @@ -137,7 +137,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 From 1cfbfccaa5b87446e5d66709559e14dc2207d3e0 Mon Sep 17 00:00:00 2001 From: artragis Date: Sat, 3 Oct 2015 13:19:23 +0200 Subject: [PATCH 17/55] fix les vieux tests mal fichus. --- zds/tutorialv2/tests/tests_views.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/zds/tutorialv2/tests/tests_views.py b/zds/tutorialv2/tests/tests_views.py index 28111fd8eb..fc3e9195bb 100644 --- a/zds/tutorialv2/tests/tests_views.py +++ b/zds/tutorialv2/tests/tests_views.py @@ -4190,7 +4190,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) + # simple visit does not trigger follow + self.assertEqual(len(reads), 0) self.assertEqual(reads[0].content.pk, self.tuto.pk) self.assertEqual(reads[0].note.pk, reactions[0].pk) @@ -4868,8 +4869,8 @@ def test_last_reactions(self): # 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) - - self.assertEqual(ContentRead.objects.filter(user=self.user_staff).count(), 1) + # simple visit does not trigger follow + self.assertEqual(ContentRead.objects.filter(user=self.user_staff).count(), 0) tuto = PublishableContent.objects.get(pk=self.tuto.pk) self.assertEqual(tuto.last_read_note(), reactions[1]) # now reactions are read From e1a1b4455d8871aa747f157e9de4c5ba3e6be99e Mon Sep 17 00:00:00 2001 From: artragis Date: Sat, 3 Oct 2015 14:57:16 +0200 Subject: [PATCH 18/55] fix test --- zds/tutorialv2/tests/tests_views.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/zds/tutorialv2/tests/tests_views.py b/zds/tutorialv2/tests/tests_views.py index fc3e9195bb..9d4d915383 100644 --- a/zds/tutorialv2/tests/tests_views.py +++ b/zds/tutorialv2/tests/tests_views.py @@ -4192,8 +4192,6 @@ def test_add_note(self): reads = ContentRead.objects.filter(user=self.user_staff).all() # simple visit does not trigger follow self.assertEqual(len(reads), 0) - self.assertEqual(reads[0].content.pk, self.tuto.pk) - self.assertEqual(reads[0].note.pk, reactions[0].pk) # login with author self.assertEqual( @@ -4789,7 +4787,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 @@ -4874,7 +4872,7 @@ def test_last_reactions(self): 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]) + self.assertEqual(tuto.first_unread_note(), reactions[-1]) def tearDown(self): From 2f1bf7e634b688965224f1d296e3150cdba0cdb9 Mon Sep 17 00:00:00 2001 From: artragis Date: Sat, 3 Oct 2015 15:26:30 +0200 Subject: [PATCH 19/55] the test was quite incorrect --- zds/tutorialv2/tests/tests_views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zds/tutorialv2/tests/tests_views.py b/zds/tutorialv2/tests/tests_views.py index 9d4d915383..a59f3be524 100644 --- a/zds/tutorialv2/tests/tests_views.py +++ b/zds/tutorialv2/tests/tests_views.py @@ -4871,7 +4871,7 @@ def test_last_reactions(self): self.assertEqual(ContentRead.objects.filter(user=self.user_staff).count(), 0) tuto = PublishableContent.objects.get(pk=self.tuto.pk) - self.assertEqual(tuto.last_read_note(), reactions[1]) # now reactions are read + self.assertEqual(tuto.last_read_note(), tuto.last_note) # now reactions are read self.assertEqual(tuto.first_unread_note(), reactions[-1]) def tearDown(self): From 15a3e16f6caa5f77c155f270017e552be3cdd58f Mon Sep 17 00:00:00 2001 From: artragis Date: Sat, 3 Oct 2015 19:50:01 +0200 Subject: [PATCH 20/55] =?UTF-8?q?test=20inutile=20car=20r=C3=A9p=C3=A9titi?= =?UTF-8?q?f?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zds/tutorialv2/tests/tests_views.py | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/zds/tutorialv2/tests/tests_views.py b/zds/tutorialv2/tests/tests_views.py index a59f3be524..13e44268af 100644 --- a/zds/tutorialv2/tests/tests_views.py +++ b/zds/tutorialv2/tests/tests_views.py @@ -4848,32 +4848,6 @@ 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 - self.assertEqual( - self.client.login( - username=self.user_staff.username, - password='hostel77'), - True) - - result = self.client.get(reverse('zds.pages.views.index')) # go to whatever page - self.assertEqual(result.status_code, 200) - - self.assertEqual(ContentRead.objects.filter(user=self.user_staff).count(), 0) - - 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]) - - # 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) - # simple visit does not trigger follow - self.assertEqual(ContentRead.objects.filter(user=self.user_staff).count(), 0) - - tuto = PublishableContent.objects.get(pk=self.tuto.pk) - self.assertEqual(tuto.last_read_note(), tuto.last_note) # now reactions are read - self.assertEqual(tuto.first_unread_note(), reactions[-1]) - def tearDown(self): if os.path.isdir(settings.ZDS_APP['content']['repo_private_path']): From cbc35942cf65219154ab912c8c57d1ae668357a6 Mon Sep 17 00:00:00 2001 From: artragis Date: Sat, 3 Oct 2015 09:02:48 +0200 Subject: [PATCH 21/55] =?UTF-8?q?fix=20#3012=20:=20erreur=20404=20si=20mes?= =?UTF-8?q?sage=20non=20trouv=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zds/tutorialv2/views/views_published.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/zds/tutorialv2/views/views_published.py b/zds/tutorialv2/views/views_published.py index 1f74ca6f3e..cfa27df6e7 100644 --- a/zds/tutorialv2/views/views_published.py +++ b/zds/tutorialv2/views/views_published.py @@ -445,6 +445,8 @@ def get_form_kwargs(self): .prefetch_related("author")\ .filter(pk=int(self.request.GET["message"]))\ .first() + if self.reaction is None: + raise Http404("Message asked and not found") kwargs['reaction'] = self.reaction else: raise Http404("The 'message' parameter must be a digit.") From ced82f78d6e3e1c39a5d64045b9d0b8b5a2cf8ec Mon Sep 17 00:00:00 2001 From: artragis Date: Sun, 4 Oct 2015 10:41:02 +0200 Subject: [PATCH 22/55] ajoute un test unitaire. --- zds/tutorialv2/tests/tests_views.py | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/zds/tutorialv2/tests/tests_views.py b/zds/tutorialv2/tests/tests_views.py index 13e44268af..9c99a17d4f 100644 --- a/zds/tutorialv2/tests/tests_views.py +++ b/zds/tutorialv2/tests/tests_views.py @@ -4787,7 +4787,7 @@ def test_last_reactions(self): tuto = PublishableContent.objects.get(pk=self.tuto.pk) - reactions = list(ContentReaction.objects.filter(related_content=self.tuto).all()) + reactions = 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 @@ -4848,6 +4848,23 @@ def test_last_reactions(self): result = self.client.get(reverse('zds.pages.views.index')) # go to whatever page self.assertEqual(result.status_code, 200) + 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) + def tearDown(self): if os.path.isdir(settings.ZDS_APP['content']['repo_private_path']): From ad5e33d279b9996f6e5e3d257ed054eef3c03457 Mon Sep 17 00:00:00 2001 From: artragis Date: Wed, 30 Sep 2015 15:39:40 +0200 Subject: [PATCH 23/55] =?UTF-8?q?v=C3=A9rifie=20la=20coh=C3=A9rence=20du?= =?UTF-8?q?=20manifest?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zds/tutorialv2/models/models_database.py | 7 +++-- zds/tutorialv2/tests/tests_utils.py | 40 +++++++++++++++++++++++- zds/tutorialv2/utils.py | 37 +++++++++++++++++----- zds/tutorialv2/views/views_contents.py | 3 +- 4 files changed, 74 insertions(+), 13 deletions(-) diff --git a/zds/tutorialv2/models/models_database.py b/zds/tutorialv2/models/models_database.py index 2fd5a0816c..16b31407be 100644 --- a/zds/tutorialv2/models/models_database.py +++ b/zds/tutorialv2/models/models_database.py @@ -308,7 +308,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 +321,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 +339,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 diff --git a/zds/tutorialv2/tests/tests_utils.py b/zds/tutorialv2/tests/tests_utils.py index 804db7ade4..b115b7f6df 100644 --- a/zds/tutorialv2/tests/tests_utils.py +++ b/zds/tutorialv2/tests/tests_utils.py @@ -15,8 +15,10 @@ 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, last_participation_is_old + get_target_tagged_tree_for_extract, retrieve_and_update_images_links, last_participation_is_old, \ + InvalidSlugError, BadManifestError, get_content_from_json 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, \ @@ -598,6 +600,42 @@ def test_last_participation_is_old(self): 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 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/utils.py b/zds/tutorialv2/utils.py index 226e659ef5..035e97360f 100644 --- a/zds/tutorialv2/utils.py +++ b/zds/tutorialv2/utils.py @@ -31,6 +31,16 @@ from zds.utils.templatetags.emarkdown import emarkdown +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): """ :param base_content: the base Publishable content we will use to retrieve the container @@ -727,7 +737,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 @@ -740,7 +750,14 @@ 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("manifest is not well formated") + json['version'] = 2 # create and fill the container + if len(json['title']) > max_title_len: + raise BadManifestError("Title must be a string of less than {} chars".format(max_title_len)) slugify_raise_on_empty(json['title']) json_slug = slugify_raise_on_empty(json['slug']) if not public: @@ -771,6 +788,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' @@ -878,7 +896,9 @@ def slugify_raise_on_empty(title, use_old_slugify=False): :return: the slugified title :rtype: str """ - + slug = slugify(title) + if not isinstance(slug, basestring): + raise InvalidSlugError("slug is incorrect") if not use_old_slugify: slug = slugify(title) else: @@ -902,14 +922,16 @@ 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"Manifest is not well formed on container " + str(json_sub['title'])) if child['object'] == 'container': slug = '' try: slug = child['slug'] - if not check_slug(slug): - raise InvalidSlugError(slug) - except (ValueError, KeyError): + slugify_raise_on_empty(slug) + except KeyError: pass new_container = Container(child['title'], slug) if 'introduction' in child: @@ -926,9 +948,8 @@ def fill_containers_from_json(json_sub, parent): slug = '' try: slug = child['slug'] - if not check_slug(slug): - raise InvalidSlugError(slug) - except (ValueError, KeyError): + slugify_raise_on_empty(slug) + except KeyError: pass new_extract = Extract(child['title'], slug) diff --git a/zds/tutorialv2/views/views_contents.py b/zds/tutorialv2/views/views_contents.py index 8277c192fc..f7bd3196bf 100644 --- a/zds/tutorialv2/views/views_contents.py +++ b/zds/tutorialv2/views/views_contents.py @@ -504,7 +504,8 @@ def extract_content_from_zip(zip_archive): _(u'Une erreur est survenue durant la lecture du manifest, ' 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: From 128e31976a12b0fc848e413d3b7f9c00800b266a Mon Sep 17 00:00:00 2001 From: artragis Date: Tue, 29 Sep 2015 20:47:02 +0200 Subject: [PATCH 24/55] =?UTF-8?q?emp=C3=AAche=20d'=C3=A9diter=20un=20messa?= =?UTF-8?q?ge=20qui=20ne=20nous=20appartient=20pas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit parce que c'est pas poli --- zds/tutorialv2/views/views_published.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/zds/tutorialv2/views/views_published.py b/zds/tutorialv2/views/views_published.py index cfa27df6e7..9fbfdc3ee4 100644 --- a/zds/tutorialv2/views/views_published.py +++ b/zds/tutorialv2/views/views_published.py @@ -445,8 +445,11 @@ def get_form_kwargs(self): .prefetch_related("author")\ .filter(pk=int(self.request.GET["message"]))\ .first() - if self.reaction is None: - raise Http404("Message asked and not found") + if not self.reaction: + raise Http404("Not such a reaction : " + 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.") From 54dd8ab54f5fb123bb145df4b7a0928e97a71eaf Mon Sep 17 00:00:00 2001 From: artragis Date: Fri, 2 Oct 2015 13:22:46 +0200 Subject: [PATCH 25/55] ajoute un TU --- zds/tutorialv2/tests/tests_views.py | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/zds/tutorialv2/tests/tests_views.py b/zds/tutorialv2/tests/tests_views.py index 9c99a17d4f..fcdad08ee6 100644 --- a/zds/tutorialv2/tests/tests_views.py +++ b/zds/tutorialv2/tests/tests_views.py @@ -4787,7 +4787,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 @@ -4865,6 +4865,29 @@ def test_note_with_bad_param(self): result = self.client.get(url_template.format(861489632, reaction.pk)) self.assertEqual(404, result.status_code) + 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 + + 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 tearDown(self): if os.path.isdir(settings.ZDS_APP['content']['repo_private_path']): From 33d8bf876f8a12123f07464bb8a394552c1549ff Mon Sep 17 00:00:00 2001 From: artragis Date: Mon, 5 Oct 2015 19:54:03 +0200 Subject: [PATCH 26/55] =?UTF-8?q?emp=C3=AAche=20d'acc=C3=A8der=20au=20cont?= =?UTF-8?q?enu=20priv=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit même quand le sha_private == sha_public --- zds/tutorialv2/mixins.py | 3 ++- zds/tutorialv2/tests/tests_views.py | 10 ++++++++++ zds/tutorialv2/urls/urls_contents.py | 11 ++++++----- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/zds/tutorialv2/mixins.py b/zds/tutorialv2/mixins.py index 29cbe7ab93..4c64918bfa 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 @@ -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): diff --git a/zds/tutorialv2/tests/tests_views.py b/zds/tutorialv2/tests/tests_views.py index fcdad08ee6..3d3e9ac50d 100644 --- a/zds/tutorialv2/tests/tests_views.py +++ b/zds/tutorialv2/tests/tests_views.py @@ -4888,6 +4888,16 @@ def test_cant_edit_not_owned_note(self): }) self.assertEqual(403, resp.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): if os.path.isdir(settings.ZDS_APP['content']['repo_private_path']): diff --git a/zds/tutorialv2/urls/urls_contents.py b/zds/tutorialv2/urls/urls_contents.py index 5763f59646..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'), From 98deca074e1052ba52f6b1ae0260dd0d0c1ab532 Mon Sep 17 00:00:00 2001 From: artragis Date: Wed, 30 Sep 2015 20:12:38 +0200 Subject: [PATCH 27/55] =?UTF-8?q?corrige=20l'affichage=20du=20titre=20des?= =?UTF-8?q?=20articles=20publi=C3=A9s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../includes/content_item_type_article.part.html | 12 ++++++++++-- .../includes/content_item_type_tutoriel.part.html | 10 +++++++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/templates/tutorialv2/includes/content_item_type_article.part.html b/templates/tutorialv2/includes/content_item_type_article.part.html index c4828a2eb6..57675114cc 100644 --- a/templates/tutorialv2/includes/content_item_type_article.part.html +++ b/templates/tutorialv2/includes/content_item_type_article.part.html @@ -19,6 +19,14 @@ {% endif %} {% endcaptureas %} +{% captureas content_title %} + {% if public_article and online %} + {{ public_article.title }} + {% else %} + {{ article.title }} + {% 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,9 +40,9 @@

    - +

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

    diff --git a/templates/tutorialv2/includes/content_item_type_tutoriel.part.html b/templates/tutorialv2/includes/content_item_type_tutoriel.part.html index 4d5dc2db97..571c718a7f 100644 --- a/templates/tutorialv2/includes/content_item_type_tutoriel.part.html +++ b/templates/tutorialv2/includes/content_item_type_tutoriel.part.html @@ -19,6 +19,14 @@ {% endif %} {% endcaptureas %} +{% captureas content_title %} + {% if public_tutorial and online %} + {{ public_tutorial.title }} + {% else %} + {{ tutorial.title }} + {% 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 %} @@ -39,7 +47,7 @@

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

    From b258e5dc877b6a0942d57c98c04e80b6a522d84a Mon Sep 17 00:00:00 2001 From: artragis Date: Mon, 5 Oct 2015 20:52:55 +0200 Subject: [PATCH 28/55] cherche le titre dans le manifest --- .../tutorialv2/includes/content_item_type_article.part.html | 2 +- .../tutorialv2/includes/content_item_type_tutoriel.part.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/tutorialv2/includes/content_item_type_article.part.html b/templates/tutorialv2/includes/content_item_type_article.part.html index 57675114cc..737eebdf73 100644 --- a/templates/tutorialv2/includes/content_item_type_article.part.html +++ b/templates/tutorialv2/includes/content_item_type_article.part.html @@ -21,7 +21,7 @@ {% captureas content_title %} {% if public_article and online %} - {{ public_article.title }} + {{ public_article.load_public_version.title }} {% else %} {{ article.title }} {% endif %} diff --git a/templates/tutorialv2/includes/content_item_type_tutoriel.part.html b/templates/tutorialv2/includes/content_item_type_tutoriel.part.html index 571c718a7f..b5ca364465 100644 --- a/templates/tutorialv2/includes/content_item_type_tutoriel.part.html +++ b/templates/tutorialv2/includes/content_item_type_tutoriel.part.html @@ -21,7 +21,7 @@ {% captureas content_title %} {% if public_tutorial and online %} - {{ public_tutorial.title }} + {{ public_tutorial.load_public_version.title }} {% else %} {{ tutorial.title }} {% endif %} @@ -38,7 +38,7 @@ {% endcaptureas %}

    - +
    {% if tutorial.image %} From 927ddca4fade1fe8eca30100b789228c19a9286e Mon Sep 17 00:00:00 2001 From: Situphen Date: Wed, 7 Oct 2015 20:24:37 +0200 Subject: [PATCH 29/55] Corrige quelques erreurs dans la documentation des manifestes de contenu --- doc/source/back-end/contents_manifest.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/source/back-end/contents_manifest.rst b/doc/source/back-end/contents_manifest.rst index 76b34fa981..129423187f 100644 --- a/doc/source/back-end/contents_manifest.rst +++ b/doc/source/back-end/contents_manifest.rst @@ -144,14 +144,14 @@ Version 2.0 ] } -1. ``type`` : Le type de contenu, vaut "TUTORIAL" ou "ARTICLE". **Obligatoire** +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. **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** +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. **obligatoire** From ca9966b24098ef6f67844b77aa550cf79a400758 Mon Sep 17 00:00:00 2001 From: artragis Date: Thu, 8 Oct 2015 13:43:16 +0200 Subject: [PATCH 30/55] =?UTF-8?q?Evite=20que=20le=20script=20de=20migratio?= =?UTF-8?q?n=20de=20change=20la=20date=20de=20mise=20=C3=A0=20jour?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../management/commands/migrate_to_zep12.py | 19 ++++++++++--------- zds/tutorialv2/models/models_database.py | 4 +++- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/zds/tutorialv2/management/commands/migrate_to_zep12.py b/zds/tutorialv2/management/commands/migrate_to_zep12.py index dad70ef1e2..137e5fe027 100644 --- a/zds/tutorialv2/management/commands/migrate_to_zep12.py +++ b/zds/tutorialv2/management/commands/migrate_to_zep12.py @@ -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): @@ -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() @@ -397,7 +398,7 @@ def migrate_tuto(tutos, title="Exporting mini tuto"): exported.js_support = current.js_support exported.source = current.source exported.pubdate = current.pubdate - exported.save() + exported.save(update_date=False) try: clean_commit = copy_and_clean_repo(current.get_path(False), exported.get_repo_path(False)) @@ -418,7 +419,7 @@ def migrate_tuto(tutos, title="Exporting mini tuto"): [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() + exported.save(update_date=False) # now, re create the manifest.json versioned = exported.load_version() @@ -449,7 +450,7 @@ def migrate_tuto(tutos, title="Exporting mini tuto"): exported.sha_draft = versioned.commit_changes(u"Migration version 2") exported.old_pk = current.pk - exported.save() + exported.save(update_date=False) # export beta forum post former_topic = Topic.objects.filter(key=current.pk).first() if former_topic is not None: @@ -462,7 +463,7 @@ def migrate_tuto(tutos, title="Exporting mini tuto"): former_first_post.update_content(text) former_first_post.save() exported.beta_topic = former_topic - exported.save() + exported.save(update_date=False) # extract notes reacts = Note.objects.filter(tutorial__pk=current.pk)\ .select_related("author")\ @@ -476,7 +477,7 @@ def migrate_tuto(tutos, title="Exporting mini tuto"): exported.pubdate = current.pubdate exported.sha_public = current.sha_public exported.public_version = published - exported.save() + exported.save(update_date=False) published.content_public_slug = exported.slug published.publication_date = current.pubdate published.save() diff --git a/zds/tutorialv2/models/models_database.py b/zds/tutorialv2/models/models_database.py index 16b31407be..51881eea68 100644 --- a/zds/tutorialv2/models/models_database.py +++ b/zds/tutorialv2/models/models_database.py @@ -134,7 +134,9 @@ 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): From c735a9aae0a905f85e6c79750383a38591fa8c8c Mon Sep 17 00:00:00 2001 From: artragis Date: Thu, 8 Oct 2015 13:46:39 +0200 Subject: [PATCH 31/55] met la date avant le render_to_string --- zds/tutorialv2/utils.py | 1 + 1 file changed, 1 insertion(+) diff --git a/zds/tutorialv2/utils.py b/zds/tutorialv2/utils.py index 035e97360f..abff86bc5b 100644 --- a/zds/tutorialv2/utils.py +++ b/zds/tutorialv2/utils.py @@ -588,6 +588,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}) From a78df59b485e8b8eaf2a077ec72d1d97237cfecd Mon Sep 17 00:00:00 2001 From: pierre-24 Date: Sun, 11 Oct 2015 13:45:06 +0200 Subject: [PATCH 32/55] Suppression de quelques #TODOs inutiles (aide #3064) --- zds/tutorialv2/models/models_database.py | 2 -- zds/tutorialv2/models/models_versioned.py | 3 --- zds/tutorialv2/utils.py | 2 -- zds/tutorialv2/views/views_published.py | 2 -- zds/tutorialv2/views/views_validations.py | 1 - 5 files changed, 10 deletions(-) diff --git a/zds/tutorialv2/models/models_database.py b/zds/tutorialv2/models/models_database.py index 51881eea68..805a636f38 100644 --- a/zds/tutorialv2/models/models_database.py +++ b/zds/tutorialv2/models/models_database.py @@ -536,8 +536,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' diff --git a/zds/tutorialv2/models/models_versioned.py b/zds/tutorialv2/models/models_versioned.py index 433e57419b..24f4289719 100644 --- a/zds/tutorialv2/models/models_versioned.py +++ b/zds/tutorialv2/models/models_versioned.py @@ -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 @@ -278,7 +276,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. diff --git a/zds/tutorialv2/utils.py b/zds/tutorialv2/utils.py index abff86bc5b..cce70cf1c8 100644 --- a/zds/tutorialv2/utils.py +++ b/zds/tutorialv2/utils.py @@ -474,8 +474,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 diff --git a/zds/tutorialv2/views/views_published.py b/zds/tutorialv2/views/views_published.py index 9fbfdc3ee4..f65f184666 100644 --- a/zds/tutorialv2/views/views_published.py +++ b/zds/tutorialv2/views/views_published.py @@ -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}) diff --git a/zds/tutorialv2/views/views_validations.py b/zds/tutorialv2/views/views_validations.py index 1f810f110f..ba0908f1be 100644 --- a/zds/tutorialv2/views/views_validations.py +++ b/zds/tutorialv2/views/views_validations.py @@ -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( From ec321f9c3031530a07a5db2186dec8321f237576 Mon Sep 17 00:00:00 2001 From: pierre-24 Date: Sun, 11 Oct 2015 13:46:59 +0200 Subject: [PATCH 33/55] Corrige une coquille (fix #3063) --- zds/tutorialv2/models/models_database.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zds/tutorialv2/models/models_database.py b/zds/tutorialv2/models/models_database.py index 805a636f38..6a0e0cd2e9 100644 --- a/zds/tutorialv2/models/models_database.py +++ b/zds/tutorialv2/models/models_database.py @@ -353,7 +353,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' ] From 9b73080ffde6c66654a730f344f9527c7764521d Mon Sep 17 00:00:00 2001 From: pierre-24 Date: Sun, 11 Oct 2015 13:48:59 +0200 Subject: [PATCH 34/55] =?UTF-8?q?Supprime=20une=20fonction=20inutilis?= =?UTF-8?q?=C3=A9e=20(fix=20#3065)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zds/tutorialv2/models/models_database.py | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/zds/tutorialv2/models/models_database.py b/zds/tutorialv2/models/models_database.py index 6a0e0cd2e9..968a9a85b2 100644 --- a/zds/tutorialv2/models/models_database.py +++ b/zds/tutorialv2/models/models_database.py @@ -491,17 +491,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 From 258056494778b449dc5814d2dae004eaec946c06 Mon Sep 17 00:00:00 2001 From: pierre-24 Date: Sun, 11 Oct 2015 13:55:59 +0200 Subject: [PATCH 35/55] Uniformise les messages (fix #3069) --- zds/tutorialv2/views/views_contents.py | 26 ++++++++++++------------- zds/tutorialv2/views/views_published.py | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/zds/tutorialv2/views/views_contents.py b/zds/tutorialv2/views/views_contents.py index f7bd3196bf..3eead43a73 100644 --- a/zds/tutorialv2/views/views_contents.py +++ b/zds/tutorialv2/views/views_contents.py @@ -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])) @@ -679,7 +679,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: @@ -693,7 +693,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 @@ -752,7 +752,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( @@ -787,7 +787,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: @@ -804,7 +804,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() @@ -875,7 +875,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( @@ -913,7 +913,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) @@ -1092,7 +1092,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) @@ -1787,10 +1787,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 diff --git a/zds/tutorialv2/views/views_published.py b/zds/tutorialv2/views/views_published.py index f65f184666..11f89611c9 100644 --- a/zds/tutorialv2/views/views_published.py +++ b/zds/tutorialv2/views/views_published.py @@ -628,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()) From 8c7f3c38571ae3fb0d5bea323f9bf8384b649c85 Mon Sep 17 00:00:00 2001 From: pierre-24 Date: Sun, 11 Oct 2015 14:02:46 +0200 Subject: [PATCH 36/55] Supprime une duplication de code (fix #3067) --- zds/tutorialv2/models/models_database.py | 14 ++------------ zds/tutorialv2/tests/tests_views.py | 5 ++++- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/zds/tutorialv2/models/models_database.py b/zds/tutorialv2/models/models_database.py index 968a9a85b2..5001fa173f 100644 --- a/zds/tutorialv2/models/models_database.py +++ b/zds/tutorialv2/models/models_database.py @@ -558,12 +558,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}) @@ -672,12 +667,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}) diff --git a/zds/tutorialv2/tests/tests_views.py b/zds/tutorialv2/tests/tests_views.py index 3d3e9ac50d..3912143473 100644 --- a/zds/tutorialv2/tests/tests_views.py +++ b/zds/tutorialv2/tests/tests_views.py @@ -3268,6 +3268,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) @@ -3275,8 +3277,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( From 792ae4cbdb5029cec652f16fa7c1eb90a047c399 Mon Sep 17 00:00:00 2001 From: pierre-24 Date: Sun, 11 Oct 2015 12:06:20 +0200 Subject: [PATCH 37/55] Corrige les erreurs sur `get_commit_author()` --- .../management/commands/migrate_to_zep12.py | 4 +- zds/tutorialv2/tests/tests_utils.py | 40 ++++++++++++++++++- zds/tutorialv2/utils.py | 15 +++++-- 3 files changed, 52 insertions(+), 7 deletions(-) diff --git a/zds/tutorialv2/management/commands/migrate_to_zep12.py b/zds/tutorialv2/management/commands/migrate_to_zep12.py index 137e5fe027..5b3b2368da 100644 --- a/zds/tutorialv2/management/commands/migrate_to_zep12.py +++ b/zds/tutorialv2/management/commands/migrate_to_zep12.py @@ -22,7 +22,7 @@ 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 @@ -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) diff --git a/zds/tutorialv2/tests/tests_utils.py b/zds/tutorialv2/tests/tests_utils.py index b115b7f6df..2d8a7db350 100644 --- a/zds/tutorialv2/tests/tests_utils.py +++ b/zds/tutorialv2/tests/tests_utils.py @@ -10,6 +10,7 @@ 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, \ @@ -18,7 +19,7 @@ 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, last_participation_is_old, \ - InvalidSlugError, BadManifestError, get_content_from_json + InvalidSlugError, BadManifestError, get_content_from_json, get_commit_author 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, \ @@ -636,6 +637,43 @@ def testParseBadManifest(self): 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 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/utils.py b/zds/tutorialv2/utils.py index abff86bc5b..2fe7e2dab1 100644 --- a/zds/tutorialv2/utils.py +++ b/zds/tutorialv2/utils.py @@ -29,6 +29,7 @@ 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): @@ -1014,14 +1015,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 @@ -1029,11 +1031,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)} From 9d7a570db9d6865d66fe4d396d3664e34922ccc4 Mon Sep 17 00:00:00 2001 From: artragis Date: Mon, 12 Oct 2015 13:37:00 +0200 Subject: [PATCH 38/55] =?UTF-8?q?ordonne=20les=20cat=C3=A9gorie=20dans=20l?= =?UTF-8?q?e=20formulaire=20d'import?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zds/tutorialv2/forms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zds/tutorialv2/forms.py b/zds/tutorialv2/forms.py index 4f2a7a2ff1..d887059a4b 100644 --- a/zds/tutorialv2/forms.py +++ b/zds/tutorialv2/forms.py @@ -386,7 +386,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={ From e048f70621c7c90411188d13097be59c984ad2c8 Mon Sep 17 00:00:00 2001 From: pierre-24 Date: Wed, 14 Oct 2015 22:20:18 +0200 Subject: [PATCH 39/55] Corrige erreur d'upload d'image (fix #3095) --- zds/tutorialv2/tests/tests_views.py | 9 ++++++++- zds/tutorialv2/views/views_contents.py | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/zds/tutorialv2/tests/tests_views.py b/zds/tutorialv2/tests/tests_views.py index 3912143473..f4c878f58a 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) diff --git a/zds/tutorialv2/views/views_contents.py b/zds/tutorialv2/views/views_contents.py index 3eead43a73..a2eae81c8c 100644 --- a/zds/tutorialv2/views/views_contents.py +++ b/zds/tutorialv2/views/views_contents.py @@ -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 @@ -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 From 789120b9f60cbe9866a6f2ca5b9935496b3d882b Mon Sep 17 00:00:00 2001 From: pierre-24 Date: Wed, 14 Oct 2015 23:06:49 +0200 Subject: [PATCH 40/55] Corrige une erreur 500 lors de la citation d'un commentaire inexistant (fix #3088) Fin de la saison 3. --- zds/tutorialv2/tests/tests_views.py | 47 +++++++++++++++++++++++++ zds/tutorialv2/views/views_published.py | 8 ++--- 2 files changed, 51 insertions(+), 4 deletions(-) diff --git a/zds/tutorialv2/tests/tests_views.py b/zds/tutorialv2/tests/tests_views.py index 3912143473..f01a5ee600 100644 --- a/zds/tutorialv2/tests/tests_views.py +++ b/zds/tutorialv2/tests/tests_views.py @@ -4891,6 +4891,53 @@ def test_cant_edit_not_owned_note(self): }) 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) + 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)' + + # add note : + reaction = ContentReaction(related_content=tuto, position=1) + reaction.update_content(text) + reaction.author = self.user_guest + reaction.save() + + self.assertEqual( + self.client.login( + username=self.user_author.username, + password='hostel77'), + True) + + # 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( diff --git a/zds/tutorialv2/views/views_published.py b/zds/tutorialv2/views/views_published.py index 11f89611c9..dbe32037d9 100644 --- a/zds/tutorialv2/views/views_published.py +++ b/zds/tutorialv2/views/views_published.py @@ -364,10 +364,10 @@ def get(self, request, *args, **kwargs): reaction = ContentReaction.objects.filter(pk=cited_pk).first() - if not reaction.is_visible: - raise PermissionDenied - 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()) @@ -485,7 +485,7 @@ def form_valid(self, form): 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) From 40240097262d0394b42f9fa66f77d137bf2a499d Mon Sep 17 00:00:00 2001 From: artragis Date: Wed, 14 Oct 2015 13:43:42 +0200 Subject: [PATCH 41/55] =?UTF-8?q?Am=C3=A9liore=20le=20PublishedContent=20p?= =?UTF-8?q?our=20=C3=A9viter=20les=20incoh=C3=A9rences?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../content_item_type_article.part.html | 12 +++- .../content_item_type_tutoriel.part.html | 12 +++- .../includes/tags_authors.part.html | 16 ++++-- .../0008_publishedcontent_update_date.py | 20 +++++++ zds/tutorialv2/mixins.py | 5 +- zds/tutorialv2/models/models_database.py | 23 +++++++- zds/tutorialv2/tests/tests_models.py | 46 ++++++++++++++- zds/tutorialv2/tests/tests_views.py | 56 ++++++++++++++++++- zds/tutorialv2/utils.py | 2 + zds/tutorialv2/views/views_contents.py | 4 +- zds/tutorialv2/views/views_published.py | 8 +-- 11 files changed, 183 insertions(+), 21 deletions(-) create mode 100644 zds/tutorialv2/migrations/0008_publishedcontent_update_date.py diff --git a/templates/tutorialv2/includes/content_item_type_article.part.html b/templates/tutorialv2/includes/content_item_type_article.part.html index 737eebdf73..b1fe3ba6a4 100644 --- a/templates/tutorialv2/includes/content_item_type_article.part.html +++ b/templates/tutorialv2/includes/content_item_type_article.part.html @@ -21,12 +21,20 @@ {% captureas content_title %} {% if public_article and online %} - {{ public_article.load_public_version.title }} + {{ 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 %} @@ -40,7 +48,7 @@
    - +

    {{ content_title }}

    diff --git a/templates/tutorialv2/includes/content_item_type_tutoriel.part.html b/templates/tutorialv2/includes/content_item_type_tutoriel.part.html index b5ca364465..a61549a0f6 100644 --- a/templates/tutorialv2/includes/content_item_type_tutoriel.part.html +++ b/templates/tutorialv2/includes/content_item_type_tutoriel.part.html @@ -21,12 +21,20 @@ {% captureas content_title %} {% if public_tutorial and online %} - {{ public_tutorial.load_public_version.title }} + {{ 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 %} @@ -38,7 +46,7 @@ {% endcaptureas %}
    - +
    {% if tutorial.image %} diff --git a/templates/tutorialv2/includes/tags_authors.part.html b/templates/tutorialv2/includes/tags_authors.part.html index cecc0210e4..df7813bfb4 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 captureas %} {% if content.subcategory.all|length > 0 %}
      @@ -11,19 +11,25 @@
    {% endif %} - +{% captureas update_date %} + {% if online %} + {{ content.public_object.get_last_action_date }} + {% else %} + {{ content.update_date }} + {% endif %} +{% endcaptureas %} {% if content.update_date %} - {% if online and content.update_date == content.pubdate %} + {% if online and update_date == content.pubdate %} {% trans "Publié" %} : - 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 4c64918bfa..1c6cd2fb52 100644 --- a/zds/tutorialv2/mixins.py +++ b/zds/tutorialv2/mixins.py @@ -135,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): diff --git a/zds/tutorialv2/models/models_database.py b/zds/tutorialv2/models/models_database.py index 5001fa173f..f732fbab10 100644 --- a/zds/tutorialv2/models/models_database.py +++ b/zds/tutorialv2/models/models_database.py @@ -536,16 +536,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,14 +582,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): """ @@ -719,6 +735,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): """ 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_views.py b/zds/tutorialv2/tests/tests_views.py index 3912143473..ea09d91c26 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) @@ -4891,6 +4898,53 @@ def test_cant_edit_not_owned_note(self): }) 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) + 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)' + + # add note : + reaction = ContentReaction(related_content=tuto, position=1) + reaction.update_content(text) + reaction.author = self.user_guest + reaction.save() + + self.assertEqual( + self.client.login( + username=self.user_author.username, + password='hostel77'), + True) + + # 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( diff --git a/zds/tutorialv2/utils.py b/zds/tutorialv2/utils.py index 309dee16ea..55e656da5f 100644 --- a/zds/tutorialv2/utils.py +++ b/zds/tutorialv2/utils.py @@ -664,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() diff --git a/zds/tutorialv2/views/views_contents.py b/zds/tutorialv2/views/views_contents.py index 3eead43a73..a2eae81c8c 100644 --- a/zds/tutorialv2/views/views_contents.py +++ b/zds/tutorialv2/views/views_contents.py @@ -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 @@ -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 diff --git a/zds/tutorialv2/views/views_published.py b/zds/tutorialv2/views/views_published.py index 11f89611c9..dbe32037d9 100644 --- a/zds/tutorialv2/views/views_published.py +++ b/zds/tutorialv2/views/views_published.py @@ -364,10 +364,10 @@ def get(self, request, *args, **kwargs): reaction = ContentReaction.objects.filter(pk=cited_pk).first() - if not reaction.is_visible: - raise PermissionDenied - 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()) @@ -485,7 +485,7 @@ def form_valid(self, form): 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) From e092e18017fd23016ad6ca10807fbb6b526a9a4d Mon Sep 17 00:00:00 2001 From: artragis Date: Mon, 19 Oct 2015 09:47:42 +0200 Subject: [PATCH 42/55] affiche la bonne description --- .../tutorialv2/includes/content_item_type_tutoriel.part.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/tutorialv2/includes/content_item_type_tutoriel.part.html b/templates/tutorialv2/includes/content_item_type_tutoriel.part.html index a61549a0f6..54dc7927e5 100644 --- a/templates/tutorialv2/includes/content_item_type_tutoriel.part.html +++ b/templates/tutorialv2/includes/content_item_type_tutoriel.part.html @@ -59,8 +59,8 @@

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

    From caa2731e72949eb023aba6ccde2e1dd51c4d958a Mon Sep 17 00:00:00 2001 From: artragis Date: Mon, 19 Oct 2015 13:19:46 +0200 Subject: [PATCH 43/55] essaie de comprendre pourquoi. --- zds/tutorialv2/models/models_versioned.py | 21 +++++++++++++-------- zds/tutorialv2/utils.py | 7 +++++-- zds/tutorialv2/views/views_contents.py | 4 ++-- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/zds/tutorialv2/models/models_versioned.py b/zds/tutorialv2/models/models_versioned.py index 24f4289719..c8ed03c8bb 100644 --- a/zds/tutorialv2/models/models_versioned.py +++ b/zds/tutorialv2/models/models_versioned.py @@ -516,7 +516,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 @@ -526,11 +526,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 @@ -549,20 +551,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 diff --git a/zds/tutorialv2/utils.py b/zds/tutorialv2/utils.py index 309dee16ea..4f8da727c7 100644 --- a/zds/tutorialv2/utils.py +++ b/zds/tutorialv2/utils.py @@ -866,7 +866,9 @@ def get_content_from_json(json, sha, slug_last_draft, public=False, max_title_le class InvalidSlugError(ValueError): - pass + + def __init__(self, *args, **kwargs): + super(InvalidSlugError, self).__init__(*args, **kwargs) def check_slug(slug): @@ -948,7 +950,8 @@ def fill_containers_from_json(json_sub, parent): slug = '' try: slug = child['slug'] - slugify_raise_on_empty(slug) + if not check_slug(slug): + raise InvalidSlugError(child['slug']) except KeyError: pass new_extract = Extract(child['title'], slug) diff --git a/zds/tutorialv2/views/views_contents.py b/zds/tutorialv2/views/views_contents.py index a2eae81c8c..5e902ecf44 100644 --- a/zds/tutorialv2/views/views_contents.py +++ b/zds/tutorialv2/views/views_contents.py @@ -554,7 +554,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): @@ -564,7 +564,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): From a91e0459744352fe80d791154b6ba6cbb72afaf4 Mon Sep 17 00:00:00 2001 From: artragis Date: Tue, 20 Oct 2015 13:00:45 +0200 Subject: [PATCH 44/55] =?UTF-8?q?corrige=20le=20bug=20des=20b=C3=A9ta=20to?= =?UTF-8?q?pic?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zds/tutorialv2/tests/tests_views.py | 3 +- zds/tutorialv2/views/views_contents.py | 87 +++++++++++++------------- 2 files changed, 46 insertions(+), 44 deletions(-) diff --git a/zds/tutorialv2/tests/tests_views.py b/zds/tutorialv2/tests/tests_views.py index ea09d91c26..2a3725dea6 100644 --- a/zds/tutorialv2/tests/tests_views.py +++ b/zds/tutorialv2/tests/tests_views.py @@ -587,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]) diff --git a/zds/tutorialv2/views/views_contents.py b/zds/tutorialv2/views/views_contents.py index 5e902ecf44..ad84dd4e59 100644 --- a/zds/tutorialv2/views/views_contents.py +++ b/zds/tutorialv2/views/views_contents.py @@ -43,7 +43,7 @@ default_slug_pool, BadArchiveError, InvalidSlugError 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 @@ -1280,6 +1280,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) @@ -1330,37 +1369,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( @@ -1379,18 +1391,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( @@ -1414,7 +1415,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) From 613a984b1eceee6577dc37f6b41efeafdf4b8e72 Mon Sep 17 00:00:00 2001 From: artragis Date: Wed, 14 Oct 2015 13:43:42 +0200 Subject: [PATCH 45/55] =?UTF-8?q?Am=C3=A9liore=20le=20PublishedContent=20p?= =?UTF-8?q?our=20=C3=A9viter=20les=20incoh=C3=A9rences?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../content_item_type_article.part.html | 12 ++++- .../content_item_type_tutoriel.part.html | 12 ++++- .../includes/tags_authors.part.html | 16 +++++-- .../0008_publishedcontent_update_date.py | 20 ++++++++ zds/tutorialv2/mixins.py | 5 +- zds/tutorialv2/models/models_database.py | 23 +++++++++- zds/tutorialv2/tests/tests_models.py | 46 ++++++++++++++++++- zds/tutorialv2/utils.py | 2 + 8 files changed, 122 insertions(+), 14 deletions(-) create mode 100644 zds/tutorialv2/migrations/0008_publishedcontent_update_date.py diff --git a/templates/tutorialv2/includes/content_item_type_article.part.html b/templates/tutorialv2/includes/content_item_type_article.part.html index 737eebdf73..b1fe3ba6a4 100644 --- a/templates/tutorialv2/includes/content_item_type_article.part.html +++ b/templates/tutorialv2/includes/content_item_type_article.part.html @@ -21,12 +21,20 @@ {% captureas content_title %} {% if public_article and online %} - {{ public_article.load_public_version.title }} + {{ 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 %} @@ -40,7 +48,7 @@
    - +

    {{ content_title }}

    diff --git a/templates/tutorialv2/includes/content_item_type_tutoriel.part.html b/templates/tutorialv2/includes/content_item_type_tutoriel.part.html index b5ca364465..a61549a0f6 100644 --- a/templates/tutorialv2/includes/content_item_type_tutoriel.part.html +++ b/templates/tutorialv2/includes/content_item_type_tutoriel.part.html @@ -21,12 +21,20 @@ {% captureas content_title %} {% if public_tutorial and online %} - {{ public_tutorial.load_public_version.title }} + {{ 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 %} @@ -38,7 +46,7 @@ {% endcaptureas %}
    - +
    {% if tutorial.image %} diff --git a/templates/tutorialv2/includes/tags_authors.part.html b/templates/tutorialv2/includes/tags_authors.part.html index cecc0210e4..df7813bfb4 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 captureas %} {% if content.subcategory.all|length > 0 %}
      @@ -11,19 +11,25 @@
    {% endif %} - +{% captureas update_date %} + {% if online %} + {{ content.public_object.get_last_action_date }} + {% else %} + {{ content.update_date }} + {% endif %} +{% endcaptureas %} {% if content.update_date %} - {% if online and content.update_date == content.pubdate %} + {% if online and update_date == content.pubdate %} {% trans "Publié" %} : - 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 4c64918bfa..1c6cd2fb52 100644 --- a/zds/tutorialv2/mixins.py +++ b/zds/tutorialv2/mixins.py @@ -135,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): diff --git a/zds/tutorialv2/models/models_database.py b/zds/tutorialv2/models/models_database.py index 5001fa173f..f732fbab10 100644 --- a/zds/tutorialv2/models/models_database.py +++ b/zds/tutorialv2/models/models_database.py @@ -536,16 +536,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,14 +582,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): """ @@ -719,6 +735,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): """ 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/utils.py b/zds/tutorialv2/utils.py index 4f8da727c7..1c803f4074 100644 --- a/zds/tutorialv2/utils.py +++ b/zds/tutorialv2/utils.py @@ -664,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() From b54c610703bd3a48e6af3a3d810706f488d456da Mon Sep 17 00:00:00 2001 From: artragis Date: Mon, 19 Oct 2015 09:47:42 +0200 Subject: [PATCH 46/55] affiche la bonne description --- .../tutorialv2/includes/content_item_type_tutoriel.part.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/tutorialv2/includes/content_item_type_tutoriel.part.html b/templates/tutorialv2/includes/content_item_type_tutoriel.part.html index a61549a0f6..54dc7927e5 100644 --- a/templates/tutorialv2/includes/content_item_type_tutoriel.part.html +++ b/templates/tutorialv2/includes/content_item_type_tutoriel.part.html @@ -59,8 +59,8 @@

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

    From 6bb0d8c3754b67fd952f64860605b8a17a76c178 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?fran=C3=A7ois=20dambrine?= Date: Sun, 25 Oct 2015 13:39:38 +0100 Subject: [PATCH 47/55] =?UTF-8?q?Met=20=C3=A0=20jour=20le=20template=20ave?= =?UTF-8?q?c=20la=20date?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../includes/tags_authors.part.html | 24 +++++++++---------- zds/tutorialv2/forms.py | 3 +++ 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/templates/tutorialv2/includes/tags_authors.part.html b/templates/tutorialv2/includes/tags_authors.part.html index df7813bfb4..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 captureas %} +{% load set %} {% if content.subcategory.all|length > 0 %}
      @@ -11,24 +11,22 @@
    {% endif %} -{% captureas update_date %} - {% if online %} - {{ content.public_object.get_last_action_date }} - {% else %} - {{ content.update_date }} - {% endif %} -{% endcaptureas %} +{% 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 update_date == content.pubdate %} + {% if online and update_date == public_object.publication_date %} {% trans "Publié" %} : -