diff --git a/Gulpfile.js b/Gulpfile.js index c03ec38d8d..3231b43069 100644 --- a/Gulpfile.js +++ b/Gulpfile.js @@ -8,10 +8,16 @@ var paths = { scripts: "assets/js/**", images: "assets/images/**", smileys: "assets/smileys/**", - copy: "assets/misc/**", - stylesheet: "assets/scss/main.scss", - scss: ["assets/scss/**", "!assets/scss/_sprite.scss"], - sass: { + errors_main: "errors/scss/main.scss", + errors_path: "errors/scss/**", + errors: { + sass: "errors/scss", + images: "errors/images", + includePaths: ["errors/scss", "assets/bower_components/modularized-normalize-scss"], + }, + styles_main: "assets/scss/main.scss", + styles_path: ["assets/scss/**", "!assets/scss/_sprite.scss"], + styles: { sass: "assets/scss", images: "assets/images", includePaths: ["assets/scss", "assets/bower_components/modularized-normalize-scss"], @@ -36,12 +42,31 @@ gulp.task("script", ["test"], function() { .pipe($.size({ title: "main.min.js" })); }); +gulp.task("clean-errors", function() { + return gulp.src(["errors/css/*"]) + .pipe($.clean()); +}); + +gulp.task("errors", ["clean-errors"], function() { + return gulp.src(paths.errors_main) + .pipe($.sass({ + sass: paths.errors.sass, + imagePath: paths.errors.images, + includePaths: paths.errors.includePaths + })) + .pipe($.autoprefixer(["last 1 version", "> 1%", "ff >= 20", "ie >= 8", "opera >= 12", "Android >= 2.2"], { cascade: true })) + .pipe(gulp.dest("errors/css")) + .pipe($.rename({ suffix: ".min" })) // génère une version minimifié + .pipe($.minifyCss()) + .pipe(gulp.dest("errors/css")); +}); + gulp.task("stylesheet", ["sprite"], function() { - return gulp.src(paths.stylesheet) + return gulp.src(paths.styles_main) .pipe($.sass({ - sass: paths.sass.sass, - imagePath: paths.sass.images, - includePaths: paths.sass.includePaths + sass: paths.styles.sass, + imagePath: paths.styles.images, + includePaths: paths.styles.includePaths })) .pipe($.autoprefixer(["last 1 version", "> 1%", "ff >= 20", "ie >= 8", "opera >= 12", "Android >= 2.2"], { cascade: true })) .pipe(gulp.dest("dist/css")) @@ -71,7 +96,7 @@ gulp.task("sprite", function() { } })); sprite.img.pipe(gulp.dest("dist/images")); - sprite.css.pipe(gulp.dest(paths.sass.sass)); + sprite.css.pipe(gulp.dest(paths.styles.sass)); return sprite.css; }); @@ -115,17 +140,23 @@ gulp.task("merge-scripts", ["script", "vendors"], function() { gulp.task("watch", function(cb) { gulp.watch(paths.scripts, ["script"]); - gulp.watch(paths.copy, ["copy"]); gulp.watch(paths.smiley, ["smileys"]); gulp.watch(paths.images, ["images"]); - gulp.watch(paths.scss, ["stylesheet"]); + gulp.watch(paths.styles_path, ["stylesheet"]); + gulp.watch(paths.errors_path, ["errors"]); gulp.watch(paths.sprite, ["sprite", "stylesheet"]); gulp.watch("dist/*/**", function(file) { - filePath = path.join("static/", path.relative(path.join(__dirname, "dist/"), file.path)); // Pour que le chemin ressemble à static/.../... + var filePath = path.join("static/", path.relative(path.join(__dirname, "dist/"), file.path)); // Pour que le chemin ressemble à static/.../... $.livereload.changed(filePath); }); + gulp.watch("errors/*/**", function(file) { + setImmediate(function(){ + $.livereload.changed(file.path); + }); + }); + $.livereload.listen(); }); @@ -135,11 +166,6 @@ gulp.task("test", function() { .pipe($.jshint.reporter("jshint-stylish")); }); -gulp.task("copy", function() { - return gulp.src(paths.copy) - .pipe(gulp.dest("dist/")); -}); - gulp.task("pack", ["build"], function() { return gulp.src(["dist/*/**", "!dist/pack.zip"]) .pipe($.zip("pack.zip")) @@ -149,6 +175,6 @@ gulp.task("pack", ["build"], function() { gulp.task("travis", ["test"]); -gulp.task("build", ["smileys", "images", "sprite", "stylesheet", "vendors", "script", "merge-scripts", "copy"]); +gulp.task("build", ["smileys", "images", "sprite", "stylesheet", "vendors", "script", "merge-scripts"]); gulp.task("default", ["build", "watch"]); diff --git a/README.md b/README.md index b8d7eb334f..31e1f0990e 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ pip install --upgrade -r requirements.txt Pour bénéficier de données de test, exécutez les commandes suivantes, dans l'ordre, à la fin des précédentes : ```console -python manage.py loaddata fixtures/users.yaml fixtures/forums.yaml fixtures/topics.yaml fixtures/mps.yaml fixtures/categories.yaml +python manage.py loaddata fixtures/users.yaml fixtures/forums.yaml fixtures/topics.yaml fixtures/mps.yaml fixtures/categories.yaml fixtures/licences.yaml ``` diff --git a/assets/images/favicon.ico b/assets/images/favicon.ico deleted file mode 100644 index 59441cc530..0000000000 Binary files a/assets/images/favicon.ico and /dev/null differ diff --git a/assets/js/mobile-menu.js b/assets/js/mobile-menu.js index 79c492b2e0..86938ffb3c 100644 --- a/assets/js/mobile-menu.js +++ b/assets/js/mobile-menu.js @@ -290,7 +290,11 @@ if(parseInt($("html").css("width")) < 960 && !disableMobileMenu){ var $newBtns = $(".sidebar .new-btn:not(.mobile-btn-imported)"); if($newBtns.length > 0){ - var $prevElem = $("#content > .content-wrapper, #content > .full-content-wrapper").find("h1, h2"); + var $prevElem = $("#content") + .find("> .content-wrapper, > .full-content-wrapper, > .content-col-2") + .first() + .find("h1, h2") + .first(); if($prevElem.next(".license").length > 0) $prevElem = $prevElem.next(".license"); if($prevElem.next(".subtitle").length > 0) diff --git a/assets/js/zen-mode.js b/assets/js/zen-mode.js index 0f358892bf..c83c564f21 100644 --- a/assets/js/zen-mode.js +++ b/assets/js/zen-mode.js @@ -8,7 +8,7 @@ "use strict"; if($(".article-content").length > 0){ - $(".content-container .taglist + .authors").before($(" - + Demander la validation {% else %} + {% if article.sha_validation != version %} +
  • + + Mettre à jour la version en validation + +
    • + {% endif %}
  • - En attente de validation + En attente de validation
    • {% endif %} + {% endif %} @@ -92,13 +105,25 @@

    Validation

    Historique de validation +
  • + + Envoyer un MP + {% if authors.all|length > 1 %} + aux auteurs + {% else %} + à l'auteur + {% endif %} + +
    • {% if not article.sha_validation = None %} {% if validation.is_pending %}
  • {% csrf_token %} -
    @@ -198,7 +223,7 @@

    Supprimer

    • {% else %}
  • - Impossible, car en publié + Impossible, car publié
    • {% endif %} diff --git a/templates/article/member/index.html b/templates/article/member/index.html index 7703d51a02..b58264bdcc 100644 --- a/templates/article/member/index.html +++ b/templates/article/member/index.html @@ -17,6 +17,8 @@ {% block breadcrumb %} {% if request.GET.type == "public" %}
  • Publiés
    • + {% elif request.GET.type == "validate" %} +
  • En validation
    • {% elif request.GET.type == "draft" %}
  • Brouillons
    • {% else %} @@ -30,6 +32,8 @@ Mes Articles {% if request.GET.type == "public" %} / Publiés + {% elif request.GET.type == "validate" %} + / En validation {% elif request.GET.type == "draft" %} / Brouillons {% endif %} @@ -41,6 +45,8 @@ Mes Articles {% if request.GET.type == "public" %} / Publiés + {% elif request.GET.type == "validate" %} + / En validation {% elif request.GET.type == "draft" %} / Brouillons {% endif %} @@ -63,7 +69,12 @@

    Filtres

  • - + + En validation + +
    • +
  • + Brouillons
    • diff --git a/templates/article/member/view.html b/templates/article/member/view.html index fa97abeaae..e6d07e1451 100644 --- a/templates/article/member/view.html +++ b/templates/article/member/view.html @@ -50,7 +50,7 @@

    {% if article.licence %} - Licence {{ article.licence }} + {{ article.licence }} {% endif %} @@ -95,20 +95,46 @@

    - {% if perms.article.change_article and article.sha_validation != None %} -

    - Cet article est en attente de validation -

    - {% if validation.comment_authors %} -
    -

    - Le message suivant a été laissé à destination des validateurs : -

    - -
    - {{ validation.comment_authors }} -
    -
    + {% if user in authors.all or perms.article.change_article %} + {% if article.sha_validation != None %} + {% if validation.version == version %} + {% if validation.validator == None %} +

    + Cet article est en attente d'un validateur +

    + {% else %} +

    + L'article est en cours de validation par + {% include "misc/member_item.part.html" with member=validation.validator %} +

    + {% endif %} + {% if validation.comment_authors %} +
    +

    + Le message suivant a été laissé à destination des validateurs : +

    + +
    + {{ validation.comment_authors }} +
    +
    + {% endif %} + {% else %} + {% if validation.validator == None %} +

    + + Une autre version de cet article + est en attente d'un validateur +

    + {% else %} +

    + + Une autre version de cet article + est en cours de validation par + {% include "misc/member_item.part.html" with member=validation.validator %} +

    + {% endif %} + {% endif %} {% endif %} {% endif %} {% endblock %} diff --git a/templates/article/validation/history.html b/templates/article/validation/history.html index 591b823d7d..32bbfad30b 100644 --- a/templates/article/validation/history.html +++ b/templates/article/validation/history.html @@ -65,6 +65,17 @@ {{ validation.date_proposition|format_date|capfirst }} + {% if validation.comment_authors %} +
    + + Message laissé à la validation + + + {% endif %} {% captureas reservation_url %} diff --git a/templates/article/validation/index.html b/templates/article/validation/index.html index 7d509cfc65..f700dd9598 100644 --- a/templates/article/validation/index.html +++ b/templates/article/validation/index.html @@ -49,18 +49,18 @@

    Filtres

    {% block headline %} Validation des articles + ({{ validations|length }}) {% endblock %}

    {% block content %} {% if validations %} - +
    - - - + + @@ -71,15 +71,19 @@

    {{ validation.article.title }} - -

    TitreCatégorie(s)Auteur(s)ProposéAuteur(s)Proposé Statut
    - {% for tag in validation.article.subcategory.all %} -

    - - {{ tag.title }} - -

    - {% endfor %} +
    + {% if validation.article.subcategory.all %} + Catégories : + {% for subcategory in validation.article.subcategory.all %} + {% if not forloop.first %} + - + {% endif %} + + {{ subcategory.title }} + {% endfor %} + {% else %} + Aucune catégorie + {% endif %}

    		{% for author in validation.article.authors.all %} @@ -87,7 +91,7 @@

    {% endfor %}

    		- {{ validation.date_proposition|format_date|capfirst }} + {{ validation.date_proposition|format_date:True|capfirst }} {% captureas reservation_url %} diff --git a/templates/base.html b/templates/base.html index d201ef6668..5ae50ae9e7 100644 --- a/templates/base.html +++ b/templates/base.html @@ -55,7 +55,7 @@ {# OpenGraph #} - + @@ -67,7 +67,7 @@ {# Twitter cards #} - + @@ -412,13 +412,13 @@ {% if perms.tutorial.change_tutorial %}
  • - Administration des tutoriels + Validation des tutoriels
    • {% endif %} {% if perms.article.change_article %}
  • - Administration des articles + Validation des articles
    • {% endif %} @@ -489,7 +489,7 @@ {% captureas schema %} {% block schema %}{% endblock %} {% endcaptureas %} -
    +

    {% block headline %}{% endblock %}

    @@ -571,6 +571,6 @@

    {{ headlin messageStyle: "none", }); - + diff --git a/templates/forum/base.html b/templates/forum/base.html index 3ec9fc242d..ba8a157e07 100644 --- a/templates/forum/base.html +++ b/templates/forum/base.html @@ -73,6 +73,7 @@

    {{ period|humane_delta }}

    + {% csrf_token %} @@ -164,4 +165,4 @@

    Flux

    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/forum/topic/index.html b/templates/forum/topic/index.html index 6769f68690..d5df6cf1d5 100644 --- a/templates/forum/topic/index.html +++ b/templates/forum/topic/index.html @@ -103,9 +103,9 @@ {% endif %} {% if forloop.first and nb = 1 %} - {% set True as answer_schema %} - {% else %} {% set False as answer_schema %} + {% else %} + {% set True as answer_schema %} {% endif %} {% include "misc/message.part.html" with perms_change=perms.forum.change_topic answer_schema=answer_schema %} @@ -140,6 +140,7 @@ + {% csrf_token %} @@ -158,6 +159,7 @@ + {% csrf_token %} @@ -174,6 +176,7 @@ + {% csrf_token %} @@ -199,6 +202,7 @@

    Modération

    + {% csrf_token %} @@ -216,6 +220,7 @@

    Modération

    + {% csrf_token %} diff --git a/templates/gallery/gallery/details.html b/templates/gallery/gallery/details.html index 5a6cbe590b..c335a76b0b 100644 --- a/templates/gallery/gallery/details.html +++ b/templates/gallery/gallery/details.html @@ -46,7 +46,7 @@ {% if u.mode == 'R' %} Lecture {% elif u.mode == 'W' %} - Ecriture + Écriture {% endif %} {% endcaptureas %}
  • @@ -105,4 +105,4 @@ {% csrf_token %}
    • -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/home.html b/templates/home.html index 9e71f19a7e..c7b286a084 100644 --- a/templates/home.html +++ b/templates/home.html @@ -89,10 +89,10 @@

    {{ article.pubdate|format_date|capfirst }} - {% if article.get_reaction_count == 0 %} diff --git a/templates/member/profile.html b/templates/member/profile.html index 96cad5f304..450f1e94ea 100644 --- a/templates/member/profile.html +++ b/templates/member/profile.html @@ -25,47 +25,67 @@ {% block content_out %}
    -

    +

    Profil de {{ usr.username }}

    - - - {% include 'misc/badge.part.html' with member=usr %} - -

    - Inscrit {{ usr.date_joined|format_date }} -

    -

    - Dernière connexion {{ usr.last_login|format_date }} -

    - {% if perms.member.show_ip %} -

    - Dernière IP : {{ profile.last_ip_address }} -

    -

    - Ville : {{ profile.get_city }} -

    - {% endif %} +
    +
    + + + {% include 'misc/badge.part.html' with member=usr %} +
    + +
      +
    • + Inscrit {{ usr.date_joined|format_date:True }} +
      • +
    • + Dernière connexion {{ usr.last_login|format_date:True }} +
      • + {% if perms.member.show_ip %} +
    • + Dernière IP : {{ profile.last_ip_address }} +
      • +
    • + {{ profile.get_city }} +
      • + {% endif %} +
    +
    + + +
    + + +     - {% if profile.show_email and user.is_authenticated %} -

    - E-mail : {{ usr.email|obfuscate_mailto }} -

    - {% endif %} {% if profile.sign %} -

    Signature

    - {{ profile.sign|emarkdown }} +

    Signature

    + {{ profile.sign|emarkdown_inline }} {% endif %} {% if topics %} -

    Derniers sujets créés

    - {% for topic in topics %} -

    {{ topic.title }}

    -
    {{ topic.subtitle }}
    - {% endfor %} +

    Derniers sujets créés

    +
    + {% for topic in topics %} + {% include "forum/includes/topic_row.part.html" %} + {% endfor %} +
    {% endif %}
    @@ -73,7 +93,7 @@
    {{ topic.subtitle }}
    {% if tutorials %} -

    Derniers tutoriels

    +

    Derniers tutoriels

    {% for tutorial in tutorials %} {% include 'tutorial/includes/tutorial_item.part.html' %} {% endfor %} @@ -81,7 +101,7 @@

    Derniers tutoriels

    {% if articles %} -

    Derniers articles

    +

    Derniers articles

    {% for article in articles %} {% include 'article/includes/article_item.part.html' %} {% endfor %} @@ -91,8 +111,9 @@

    Derniers articles

    {% if profile.biography %} -
    -

    Biographie

    +
    +
    +

    Biographie

    {{ profile.biography|emarkdown }}
    {% endif %} @@ -100,8 +121,9 @@

    Biographie

    {% if old_tutos and perms.member.change_profile %} -
    -

    Anciens Tutos SdZ

    +
    +
    +

    Anciens tutoriels SdZ

    @@ -145,14 +167,18 @@

    Anciens Tutos SdZ

    Modifier le profil {% endif %} + {% if perms.member.super_user %} + + Promouvoir + + {% endif %} {% endif %} -

    Actions

    {% endif %} -
    -

    Activité

    - -

    Tutoriels

    +
    +

    Accès rapide

    +
    -

    Articles

    - +
    +

    Activité

    -

    Forums

    - + {% if profile.get_draft_tutos.count > 0 %} +

    Tutoriels

    + + {% endif %} + + {% if profile.get_draft_articles.count > 0 %} +

    Articles

    + + {% endif %} + + {% if profile.get_post_count > 0 %} +

    Forums

    + + {% endif %} + + {% if profile.get_draft_tutos.count == 0 and profile.get_draft_articles.count == 0 and profile.get_post_count == 0 %} +
      +
    • + Aucune activité +
      • +
    + {% endif %}
    {% if perms.member.change_profile %} @@ -251,13 +386,13 @@

    Statistiques

    • - Nombre de messages modérés + Messages modérés {{ profile.get_invisible_posts_count }}
    • - Nombre d'alertes actives + Alertes actives {{ profile.get_alerts_posts_count }}
      • @@ -367,4 +502,4 @@

      Sanctions

    {% endif %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/member/settings/promote.html b/templates/member/settings/promote.html new file mode 100644 index 0000000000..a8d04fb68b --- /dev/null +++ b/templates/member/settings/promote.html @@ -0,0 +1,33 @@ +{% extends "member/settings/base.html" %} +{% load crispy_forms_tags %} + + + +{% block title %} + Pseudo et e-mail +{% endblock %} + + + +{% block breadcrumb %} +
  • Paramètres
    • +
  • Gestion des groupes
    • +{% endblock %} + + + +{% block headline %} + Gestion des groupes +{% endblock %} + + + +{% block content %} + {% if perms.member.super_user %} + {% crispy form %} + {% else %} +

    + Vous n'avez pas les droits suffisants pour régler ces paramètres. +

    + {% endif %} +{% endblock %} diff --git a/templates/misc/member_item.part.html b/templates/misc/member_item.part.html index 6b0de93951..23f5f72566 100644 --- a/templates/misc/member_item.part.html +++ b/templates/misc/member_item.part.html @@ -12,13 +12,11 @@ itemprop="author" {% endif %} >{% spaceless %} - {% if avatar %} - - {% endif %} - - - {{ member.username }} - + {% if avatar %} + + {% endif %} + + {{ member.username }} {% if info %} ({{ info }}) diff --git a/templates/misc/message.part.html b/templates/misc/message.part.html index 17711f8ab1..4bdfadd5c2 100644 --- a/templates/misc/message.part.html +++ b/templates/misc/message.part.html @@ -74,7 +74,7 @@ {% if can_edit != False %}
  • - Editer + Éditer
    • {% endif %} @@ -175,7 +175,7 @@

    {% elif message.update %}

    - Edité + Édité {% if message.editor %} par {{ message.editor }} {% endif %} diff --git a/templates/misc/pagination.part.html b/templates/misc/pagination.part.html index 7f4827f8d1..10f5c5792a 100644 --- a/templates/misc/pagination.part.html +++ b/templates/misc/pagination.part.html @@ -25,14 +25,19 @@ {% for page in pages %} {% if page %}

  • - + {{ page }}
    • {% else %}
  • - … - + ... + {% for key,val in request.GET.iterlists %} {% if key != "page" %} {% for v in val %} diff --git a/templates/misc/validation.part.html b/templates/misc/validation.part.html index 2409529333..97ce0d1908 100644 --- a/templates/misc/validation.part.html +++ b/templates/misc/validation.part.html @@ -2,14 +2,7 @@ -{% if validation.validator %} - Réservé par {% include "misc/member_item.part.html" with member=validation.validator avatar=True %} - {% if validation.date_reserve %} - {{ validation.date_reserve|format_date:True|capfirst }} -
    - {% endif %} -{% endif %} @@ -20,22 +13,55 @@ Réserver -{% elif validation.is_pending_valid %} - - Annuler la réservation - - - {% csrf_token %} -

    - Actuellement réservé par {% include "misc/member_item.part.html" with member=validation.validator %}.
    - Êtes-vous certains de vouloir annuler la réservation ? -

    - - -{% elif validation.is_accept %} - Accepté -{% elif validation.is_reject %} - Rejeté +{% else %} + {% if validation.validator %} + Réservé par {% include "misc/member_item.part.html" with member=validation.validator avatar=True %} + + {% if validation.date_reserve %} + {{ validation.date_reserve|format_date:True }} +
    + {% endif %} + {% endif %} + + {% if validation.is_pending_valid %} + + Annuler la réservation + + + {% csrf_token %} +

    + Actuellement réservé par {% include "misc/member_item.part.html" with member=validation.validator %}.
    + Êtes-vous certains de vouloir annuler la réservation ? +

    + + + {% elif validation.is_accept %} + Accepté {{ validation.date_validation|format_date:True }} + {% if validation.comment_validator %} + - + + Commentaire du validateur + + + {% endif %} + {% elif validation.is_reject %} + Rejeté {{ validation.date_validation|format_date:True }} + {% if validation.comment_validator %} + - + + Motif du rejet + + + {% endif %} + {% endif %} {% endif %} diff --git a/templates/newsletter/base.html b/templates/newsletter/base.html deleted file mode 100644 index 098f0ec85f..0000000000 --- a/templates/newsletter/base.html +++ /dev/null @@ -1,18 +0,0 @@ -{% load staticfiles %} - - - - - - - - Zeste de Savoir • Bientôt - - - - {% block content %}{% endblock %} - - - - - \ No newline at end of file diff --git a/templates/newsletter/confirm.html b/templates/newsletter/confirm.html deleted file mode 100644 index 5d11b7d581..0000000000 --- a/templates/newsletter/confirm.html +++ /dev/null @@ -1,21 +0,0 @@ -{% extends "newsletter/base.html" %} - - - -{% block content %} -
    -
    -
    -

    Zeste de Savoir

    -
    -
    -
    -
    -

    Merci pour votre souscription à la newsletter

    -

    Vous serez aux premières loges à l'ouverture de Zeste de Savoir !

    -
    -
    -
    -
    -
    -{% endblock %} \ No newline at end of file diff --git a/templates/newsletter/failed.html b/templates/newsletter/failed.html deleted file mode 100644 index cf10f123d2..0000000000 --- a/templates/newsletter/failed.html +++ /dev/null @@ -1,20 +0,0 @@ -{% extends "newsletter/base.html" %} - - - -{% block content %} -
    -
    -
    -

    Zeste de Savoir

    -
    -
    -
    -
    -

    Vous êtes déjà inscrit à la newsletter !

    -
    -
    -
    -
    -
    -{% endblock %} \ No newline at end of file diff --git a/templates/newsletter/index.html b/templates/newsletter/index.html deleted file mode 100644 index 673dec834e..0000000000 --- a/templates/newsletter/index.html +++ /dev/null @@ -1,71 +0,0 @@ -{% extends "newsletter/base.html" %} -{% load crispy_forms_tags %} - - - -{% block content %} -
    -
    -
    -

    Zeste de Savoir

    -
    -
    -
    -
    -

    Zeste de Savoir, la connaissance pour tous et sans pépins

    -

    Des tutoriels libres pour apprendre gratuitement et sans publicité

    -
    - - En savoir plus -
    - -
    - Retour - -

    - L'objectif de Zeste de Savoir est de proposer des tutoriels libres, gratuits, sans publicités, sans comptes premium ou autres joyeusetés. -

    - -

    - Le site sera développé en Python à l'aide du framework Django et le code sera open-source. Le stockage des tutoriels reposera sur un système de dépôts Git afin de proposer un outil de versionnement puissant. Le tout sera chapeauté par une association à but non lucratif. -

    - -

    - Dès le lancement du projet, nous importerons un certain nombre de tutoriels d'OpenClassrooms sous licence libre Creative Commons. Un tutoriel sous licence CC autorise à reproduire son contenu à condition de citer le nom de l'auteur et de s'engager à le publier en conservant sa licence originale. -

    - -

    - La communauté sera au cœur du site. En plus de la rédaction et de la lecture de tutoriels, les membres pourront échanger et s'entraider sur les forums. Ils pourront également s'informer à travers des articles rédigés par la communauté. -

    - -

    - Zeste de Savoir se placera donc comme un site de référence pour toutes les personnes qui souhaitent apprendre et partager leurs connaissances dans les meilleures conditions. -

    -
    - -
    -

    - S'inscrire à la newsletter pour être averti des nouveautés -

    - - {% crispy form %} - - -
    - - -
    -
    -
    -{% endblock %} \ No newline at end of file diff --git a/templates/search/search.html b/templates/search/search.html index e4a14e0ff7..7793f9be10 100644 --- a/templates/search/search.html +++ b/templates/search/search.html @@ -1,9 +1,9 @@ {% extends 'base.html' %} {% load date %} {% load emarkdown %} -{% load htmltotext %} {% load model_name %} {% load highlight %} +{% load topbar %} {% block title %} @@ -61,83 +61,87 @@

    Filtrer les résultats

    {% for result in page.object_list %} {% if result and result.object %} -
    -
    -
    -
    - {% if result.object.first_post %} - -
    - {% highlight result.object.title with query html_tag "mark" %} -
    - {% elif result.object.get_introduction_online %} -     -
    - {% highlight result.object.title with query html_tag "mark" %} -
    - {% elif result.object.get_text_online %} -     -
    - {% highlight result.object.title with query html_tag "mark" %} -
    - {% else %} -     -
    - {% highlight result.object.topic.title with query html_tag "mark" %} + {% if result.object.forum and not result.object.forum|auth_forum:user %} + {% elif result.object.topic.forum and not result.object.topic.forum|auth_forum:user %} + {% else %} +
    +
    +
    +
    + {% if result.object.first_post %} + +
    + {% highlight result.object.title with query html_tag "mark" %} +
    + {% elif result.object.get_text_online %} +     +
    + {% highlight result.object.title with query html_tag "mark" %} +
    + {% elif result.object.topic %} +     +
    + {% highlight result.object.topic.title with query html_tag "mark" %} +
    + {% else %} +     +
    + {% highlight result.object.title with query html_tag "mark" %} +
    + {% endif %} +
    + {% if result.object.first_post %} + {% with text=result.object.first_post.text|emarkdown|striptags|safe %} + {% highlight text with query html_tag "mark" %} + {% endwith %} + {% elif result.object.get_text_online %} + {% with text=result.object.get_text_online|striptags|safe %} + {% highlight text with query html_tag "mark" %} + {% endwith %} + {% elif result.object.topic %} + {% with text=result.object.text|emarkdown|striptags|safe %} + {% highlight text with query html_tag "mark" %} + {% endwith %} + {% else %} + {% with text=result.object.get_introduction_online|striptags|safe %} + {% highlight text with query html_tag "mark" %} + {% endwith %} + {% endif %} +
    +     +
    + {% model_name result.app_label result.model_name False %}
    - {% endif %} -
    +
    +
    + {% if result.object.pubdate %} + - -
    - {% model_name result.app_label result.model_name False %} -
    -
    -
    - {% if result.object.pubdate %} - - {{ result.object.pubdate|format_date|capfirst }} - - {% elif result.object.tutorial.pubdate %} - - {{ result.object.tutorial.pubdate|format_date|capfirst }} - - {% elif result.object.part.tutorial.pubdate %} - - {{ result.object.part.tutorial.pubdate|format_date|capfirst }} - - {% elif result.object.chapter.part.tutorial.pubdate %} - - {{ result.object.chapter.part.tutorial.pubdate|format_date|capfirst }} - - {% endif %} + "> + {{ result.object.pubdate|format_date|capfirst }} + + {% elif result.object.tutorial.pubdate %} + + {{ result.object.tutorial.pubdate|format_date|capfirst }} + + {% elif result.object.part.tutorial.pubdate %} + + {{ result.object.part.tutorial.pubdate|format_date|capfirst }} + + {% elif result.object.chapter.part.tutorial.pubdate %} + + {{ result.object.chapter.part.tutorial.pubdate|format_date|capfirst }} + + {% endif %} +
    -
    + {% endif %} {% endif %} {% endfor %}
    @@ -150,4 +154,4 @@

    Filtrer les résultats

    {% include "misc/pagination.part.html" with position="bottom" %} {% endif %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/tutorial/chapter/view.html b/templates/tutorial/chapter/view.html index 793dc0e561..a889c9de51 100644 --- a/templates/tutorial/chapter/view.html +++ b/templates/tutorial/chapter/view.html @@ -18,30 +18,28 @@ {% block headline %} - {% with authors=tutorial.authors.all %} -

    - {% if chapter.image %} - - {% endif %} - {{ chapter.title }} -

    - - {% if tutorial.licence %} -

    - {{ tutorial.licence }} -

    +

    + {% if chapter.image %} + {% endif %} + {{ chapter.title }} +

    + + {% if tutorial.licence %} +

    + {{ tutorial.licence }} +

    + {% endif %} - {% include 'tutorial/includes/tags_authors.part.html' %} + {% include 'tutorial/includes/tags_authors.part.html' %} - {% if tutorial.in_beta and tutorial.sha_beta == version %} -
    -
    - Attention, cette version du tutoriel est en BETA ! -
    + {% if tutorial.is_beta %} +
    +
    + Cette version du tutoriel est en BÊTA !
    - {% endif %} - {% endwith %} +
    + {% endif %} {% endblock %} @@ -146,32 +144,26 @@

    {% include "tutorial/includes/summary.part.html" with tutorial=tutorial chapter_current=chapter %} {% if chapter.part %} - {% if user in tutorial.authors.all %} + {% if user in tutorial.authors.all or perms.tutorial.change_tutorial %}

    Suppression

      - {% if not tutorial.on_line %} -
    • - - Supprimer le chapitre - - -

      - Attention, vous vous apprêtez à supprimer définitivement le chapitre "{{ chapter.title }}". -

      - - - {% csrf_token %} - - -
      • - {% else %} -
    • - Impossible car publié -
      • - {% endif %} +
    • + + Supprimer le chapitre + + +

      + Attention, vous vous apprêtez à supprimer définitivement le chapitre "{{ chapter.title }}". +

      + + + {% csrf_token %} + + +
    {% endif %} diff --git a/templates/tutorial/includes/chapter.part.html b/templates/tutorial/includes/chapter.part.html index 4bc84cdd11..b7dbc07966 100644 --- a/templates/tutorial/includes/chapter.part.html +++ b/templates/tutorial/includes/chapter.part.html @@ -5,14 +5,16 @@ {% with extracts=chapter.extracts %} {% if not chapter.type = 'MINI' %} - {% if chapter.intro and chapter.intro != "None" %} + {% if chapter.intro and chapter.intro != None %} {{ chapter.intro|emarkdown }} - {% elif not tutorial.in_beta or tutorial.sha_beta != version %} + {% elif not tutorial.is_beta %}

    Il n'y a pas d'introduction.

    {% endif %} {% endif %} + +
    {% if extracts %}
      @@ -46,7 +48,7 @@

      Êtes-vous certain de vouloir supprimer définitivement l'extrait {{ extract.title }} ?

      - + {% csrf_token %}

    • + @@ -57,11 +58,13 @@

    + {% endfor %} diff --git a/templates/tutorial/tutorial/view.html b/templates/tutorial/tutorial/view.html index da3f0be57a..ba553099b0 100644 --- a/templates/tutorial/tutorial/view.html +++ b/templates/tutorial/tutorial/view.html @@ -43,100 +43,127 @@

    {% include 'tutorial/includes/tags_authors.part.html' with tutorial=tutorial %} {% endif %} - {% if perms.tutorial.change_tutorial and tutorial.sha_validation %} -

    - Ce tutoriel est en attente de validation -

    - {% if validation.comment_authors %} -
    -

    - Le message suivant a été laissé à destination des validateurs : -

    - -
    - {{ validation.comment_authors }} -
    -
    + {% if user in tutorial.authors.all or perms.tutorial.change_tutorial %} + {% if tutorial.in_validation %} + {% if validation.version == version %} + {% if validation.is_pending %} +

    + Ce tutoriel est en attente d'un validateur +

    + {% elif validation.is_pending_valid %} +

    + Le tutoriel est en cours de validation par + {% include "misc/member_item.part.html" with member=validation.validator %} +

    + {% endif %} + {% if validation.comment_authors %} +
    +

    + Le message suivant a été laissé à destination des validateurs : +

    + +
    + {{ validation.comment_authors }} +
    +
    + {% endif %} + {% else %} + {% if validation.is_pending %} +

    + + Une autre version de ce tutoriel + est en attente d'un validateur +

    + {% elif validation.is_pending_valid %} +

    + + Une autre version de ce tutoriel + est en cours de validation par + {% include "misc/member_item.part.html" with member=validation.validator %} +

    + {% endif %} + {% endif %} {% endif %} {% endif %} - {% if tutorial.in_beta and tutorial.sha_beta == version %} + {% if tutorial.is_beta %}
    - Attention, cette version du tutoriel est en BÊTA ! + Cette version du tutoriel est en BÊTA !
    {% endif %} {% endblock %} - {% block content %} - {% with tuto_version=tutorial|repo_tuto:version %} - {% if tuto_version.introduction and tuto_version.introduction != "None" %} - {{ tuto_version.introduction|emarkdown }} - {% elif not tutorial.in_beta or tutorial.sha_beta != version %} -

    - Il n'y a pas d'introduction. -

    - {% endif %} + {% if tutorial.get_introduction and tutorial.get_introduction != "None" %} + {{ tutorial.get_introduction|emarkdown }} + {% elif not tutorial.is_beta %} +

    + Il n'y a pas d'introduction. +

    + {% endif %} - {% if tutorial.is_mini %} - {# Small tutorial #} + {% if tutorial.is_mini %} + {# Small tutorial #} - {% include "tutorial/includes/chapter.part.html" with authors=tutorial.authors.all %} - {% else %} - {# Large tutorial #} + {% include "tutorial/includes/chapter.part.html" with authors=tutorial.authors.all %} + {% else %} + {# Large tutorial #} -
    +
    - {% for part in parts %} -

    - - Partie {{ part.position_in_tutorial }} : {{ part.title }} - -

    - {% include "tutorial/includes/part.part.html" %} - {% empty %} -

    - Il n'y a actuellement aucune partie dans ce tutoriel. -

    - {% endfor %} + {% for part in parts %} +

    + + Partie {{ part.position_in_tutorial }} : {{ part.title }} + +

    + {% include "tutorial/includes/part.part.html" %} + {% empty %} +

    + Il n'y a actuellement aucune partie dans ce tutoriel. +

    + {% endfor %} -
    +
    - {% endif %} + {% endif %} - {% if tuto_version.conclusion and tuto_version.conclusion != "None" %} - {{ tuto_version.conclusion|emarkdown }} - {% elif not tutorial.in_beta or tutorial.sha_beta != version %} -

    - Il n'y a pas de conclusion. -

    - {% endif %} - {% endwith %} + {% if tutorial.get_conclusion and tutorial.get_conclusion != "None" %} + {{ tutorial.get_conclusion|emarkdown }} + {% elif not tutorial.is_beta %} +

    + Il n'y a pas de conclusion. +

    + {% endif %} {% endblock %} {% block sidebar_new %} {% if user in tutorial.authors.all or perms.tutorial.change_tutorial %} - {% if not tutorial.is_mini %} - - Ajouter une partie - - {% else %} - - Ajouter un extrait - - {% endif %} - {% if tutorial.sha_draft = version %} + {% if not tutorial.is_mini %} + + Ajouter une partie + + {% else %} + + Ajouter un extrait + + {% endif %} + Éditer + {% else %} + + Version brouillon + {% endif %} - {% endif %} + {% endif %} {% endblock %} @@ -200,15 +227,16 @@

    {% if not tutorial.in_beta %}
  • - Activer la bêta + Mettre cette version en bêta {% csrf_token %} - - + +

    - Êtes-vous certain de vouloir activer la bêta sur le tutoriel "{{ tutorial.title }}" ? + Êtes-vous certain de vouloir activer la bêta du tutoriel + "{{ tutorial.title }}" dans la version que vous voyez actuellement ?

    • {% else %} - {% if tutorial.sha_beta != version %} + {% if not tutorial.is_beta %} +
  • + + Voir la version en bêta + +
  • - - Mettre à jour la bêta + + Mettre à jour la bêta avec cette version {% csrf_token %} - - + +

    - Êtes-vous certain de vouloir mettre à jour la bêta sur le tutoriel "{{ tutorial.title }}" ? + Êtes-vous certain de vouloir mettre à jour la bêta du tutoriel + "{{ tutorial.title }}" dans la version que vous voyez actuellement ?

    • + {% else %} +
  • + + Cette version est déjà en bêta + +
    • {% endif %}
  • @@ -242,10 +282,10 @@

    {% csrf_token %} - - + +

    - Êtes-vous certain de vouloir désactiver la bêta sur le tutoriel "{{ tutorial.title }}" ? + Êtes-vous certain de vouloir désactiver la bêta du tutoriel "{{ tutorial.title }}" ?

    • - {% elif tutorial.sha_validation != version %} -
  • - - Mettre à jour la version en validation - -
    • {% else %} + {% if not tutorial.is_validation %} +
  • + + Mettre à jour la version en validation + +
    • + {% endif %}
  • En attente de validation
    • {% endif %} - {% endif %} + + {% endif %} {% endblock %} @@ -298,6 +336,18 @@

    Validation

    Historique validation +
  • + + Envoyer un MP + {% if tutorial.authors.all|length > 1 %} + aux auteurs + {% else %} + à l'auteur + {% endif %} + +
    • {% if tutorial.on_line %}
  • diff --git a/templates/tutorial/validation/history.html b/templates/tutorial/validation/history.html index 2c88442295..08451d3b00 100644 --- a/templates/tutorial/validation/history.html +++ b/templates/tutorial/validation/history.html @@ -45,6 +45,17 @@
    • - - - + + @@ -60,13 +60,19 @@

    {{ headlinesub|safe }}

    {{ validation.tutorial.title }} - -
    Version Diff. AuteurBêta
    {% if tutorial.sha_validation = log.newhexsha %} Validation - {% elif tutorial.sha_beta = log.newhexsha %} + {% endif %} + {% if tutorial.sha_beta = log.newhexsha %} Beta - {% elif tutorial.sha_draft = log.newhexsha %} - Draft - {% endif%} + {% endif %} + {% if tutorial.sha_draft = log.newhexsha %} + Draft + {% endif %} {{ log.time.0|humane_time }} @@ -85,6 +88,47 @@

    {% endif %} {% endwith %}

    		+ {% if not tutorial.sha_beta = log.newhexsha %} + {% if not tutorial.sha_beta %} + + Activer + + + {% else %} + + Mettre à jour + + + {% endif %} + {% else %} + En bêta + {% endif %} +
    {{ validation.date_proposition|format_date|capfirst }} + {% if validation.comment_authors %} +
    + + Message laissé à la validation + + + {% endif %}     		{% captureas reservation_url %} diff --git a/templates/tutorial/validation/index.html b/templates/tutorial/validation/index.html index 995322b288..1b492cb837 100644 --- a/templates/tutorial/validation/index.html +++ b/templates/tutorial/validation/index.html @@ -31,6 +31,7 @@

    {% elif request.GET.type == "orphan" %} / Non-reservés {% endif %} + ({{ validations|length }}) {% endblock %}

    @@ -47,9 +48,8 @@

    {{ headlinesub|safe }}
    TitreCatégorie(s)Auteur(s)ProposéAuteur(s)Proposé Statut
    - {% for subcategory in validation.tutorial.subcategory.all %} - - {{ subcategory.title }} - - {% endfor %} +
    + {% if validation.tutorial.subcategory.all %} + Catégories : + {% for subcategory in validation.tutorial.subcategory.all %} + {% if not forloop.first %} + - + {% endif %} + + {{ subcategory.title }} + {% endfor %} + {% else %} + Aucune catégorie + {% endif %}     		{% for author in validation.tutorial.authors.all %} @@ -74,7 +80,7 @@

    {{ headlinesub|safe }}

    {% endfor %}     		- {{ validation.date_proposition|format_date|capfirst }} + {{ validation.date_proposition|format_date:True|capfirst }} {% captureas reservation_url %} diff --git a/zds/article/forms.py b/zds/article/forms.py index eb55728cbf..037c060872 100644 --- a/zds/article/forms.py +++ b/zds/article/forms.py @@ -56,7 +56,8 @@ class ArticleForm(forms.Form): licence = forms.ModelChoiceField( label="Licence de votre publication", queryset=Licence.objects.all(), - required=False, + required=True, + empty_label=None ) def __init__(self, *args, **kwargs): diff --git a/zds/article/models.py b/zds/article/models.py index 29fe606c76..ff9dca5729 100644 --- a/zds/article/models.py +++ b/zds/article/models.py @@ -154,11 +154,12 @@ def load_dic(self, article_version): article_version['sha_draft'] = self.sha_draft article_version['sha_validation'] = self.sha_validation article_version['sha_public'] = self.sha_public + article_version['last_read_reaction'] = self.last_read_reaction article_version['get_reaction_count'] = self.get_reaction_count article_version['get_absolute_url'] = reverse('zds.article.views.view', args=[self.pk, self.slug]) article_version['get_absolute_url_online'] = reverse('zds.article.views.view_online', - args=[self.pk,slugify(article_version['title'])]) + args=[self.pk, slugify(article_version['title'])]) return article_version @@ -224,8 +225,8 @@ def last_read_reaction(self): .select_related()\ .filter(article=self, user=get_current_user())\ .latest('reaction__pubdate').reaction - except Reaction.DoesNotExist: - return self.first_post() + except: + return self.first_reaction() def first_unread_reaction(self): """Return the first reaction the user has unread.""" diff --git a/zds/article/views.py b/zds/article/views.py index 742934eefa..3c7d88a214 100644 --- a/zds/article/views.py +++ b/zds/article/views.py @@ -110,8 +110,7 @@ def view(request, article_pk, article_slug): article_version['txt'] = get_blob(repo.commit(sha).tree, article_version['text']) article_version = article.load_dic(article_version) - validation = Validation.objects.filter(article__pk=article.pk, - version=sha)\ + validation = Validation.objects.filter(article__pk=article.pk)\ .order_by("-date_proposition")\ .first() @@ -254,6 +253,10 @@ def new(request): if "licence" in data and data["licence"] != "": lc = Licence.objects.filter(pk=data["licence"]).all()[0] article.licence = lc + else: + article.licence = Licence.objects.get( + pk=settings.DEFAULT_LICENCE_PK + ) article.save() @@ -264,7 +267,11 @@ def new(request): action='add') return redirect(article.get_absolute_url()) else: - form = ArticleForm() + form = ArticleForm( + initial={ + 'licence' : Licence.objects.get(pk=settings.DEFAULT_LICENCE_PK) + } + ) return render_template('article/member/new.html', { 'form': form @@ -308,7 +315,9 @@ def edit(request): lc = Licence.objects.filter(pk=data["licence"]).all()[0] article.licence = lc else: - article.licence = None + article.licence = Licence.objects.get( + pk=settings.DEFAULT_LICENCE_PK + ) article.save() @@ -329,7 +338,9 @@ def edit(request): if "licence" in json: licence = Licence.objects.filter(code=json["licence"]).all()[0] else: - licence = None + licence = Licence.objects.get( + pk=settings.DEFAULT_LICENCE_PK + ) form = ArticleForm(initial={ 'title': json['title'], 'description': json['description'], @@ -467,12 +478,12 @@ def modify(request): # send feedback for author in article.authors.all(): - msg = u'Désolé **{0}**, ton zeste **{1}** ' + msg = (u'Désolé **{0}**, ton zeste **{1}** ' u'n\'a malheureusement pas passé l’étape de validation. ' u'Mais ne désespère pas, certaines corrections peuvent ' - u'surement être faite pour l’améliorer et repasser la ' + u'sûrement être faites pour l’améliorer et repasser la ' u'validation plus tard. Voici le message que [{2}]({3}), ' - u'ton validateur t\'a laissé\n\n`{4}`\n\nN\'hésite pas a ' + u'ton validateur t\'a laissé\n\n> {4}\n\nN\'hésite pas a ' u'lui envoyer un petit message pour discuter de la décision ' u'ou demander plus de détail si tout cela te semble ' u'injuste ou manque de clarté.'.format( @@ -480,7 +491,7 @@ def modify(request): article.title, validation.validator.username, validation.validator.profile.get_absolute_url(), - validation.comment_validator) + validation.comment_validator)) bot = get_object_or_404(User, username=settings.BOT_ACCOUNT) send_mp( bot, @@ -588,7 +599,7 @@ def modify(request): validation.version) # User actions - if request.user in article.authors.all(): + if request.user in article.authors.all() or request.user.has_perm('article.change_article'): if 'delete' in data: if article.authors.count() == 1: article.delete() @@ -599,7 +610,13 @@ def modify(request): # User would like to validate his article. So we must save the # current sha (version) of the article to his sha_validation. - elif 'pending' in request.POST and article.sha_validation is None: + elif 'pending' in request.POST: + # Delete old pending validation + Validation.objects.filter(article__pk=article_pk, + status__in=['PENDING','PENDING_V'])\ + .delete() + + # Create new validation validation = Validation() validation.status = 'PENDING' validation.article = article @@ -782,7 +799,10 @@ def reservation(request, validation_pk): validation.date_reserve = datetime.now() validation.status = 'RESERVED' validation.save() - return redirect(validation.article.get_absolute_url()) + return redirect( + validation.article.get_absolute_url() + + '?version=' + validation.version + ) @login_required @@ -952,8 +972,8 @@ def solve_alert(request): msg = (u'Bonjour {0},\n\nVous recevez ce message car vous avez ' u'signalé le message de *{1}*, dans l\'article [{2}]({3}). ' u'Votre alerte a été traitée par **{4}** et il vous a laissé ' - u'le message suivant :\n\n`{5}`\n\n\nToute l\'équipe de ' - u'la modération vous remercie'.format( + u'le message suivant :\n\n> {5}\n\nToute l\'équipe de ' + u'la modération vous remercie !'.format( alert.author.username, reaction.author.username, reaction.article.title, diff --git a/zds/forum/models.py b/zds/forum/models.py index 654289cdf3..c8411fd7f9 100644 --- a/zds/forum/models.py +++ b/zds/forum/models.py @@ -444,3 +444,22 @@ def get_last_topics(user): if cpt > 5: break return tops + +def get_topics(forum_pk, is_sticky, is_solved=None): + """ Get topics according to parameters """ + + if is_solved is not None: + return Topic.objects.filter( + forum__pk=forum_pk, + is_sticky=is_sticky, + is_solved=is_solved).order_by("-last_message__pubdate").prefetch_related( + "author", + "last_message", + "tags").all() + else: + return Topic.objects.filter( + forum__pk=forum_pk, + is_sticky=is_sticky).order_by("-last_message__pubdate").prefetch_related( + "author", + "last_message", + "tags").all() diff --git a/zds/forum/tests.py b/zds/forum/tests.py index 72c0430982..886b14c743 100644 --- a/zds/forum/tests.py +++ b/zds/forum/tests.py @@ -14,6 +14,7 @@ from .models import Post, Topic, TopicFollowed, TopicRead from zds.forum.views import get_tag_by_title +from zds.forum.models import get_topics class ForumMemberTests(TestCase): @@ -971,3 +972,27 @@ def test_url_topic(self): slugify(topic1.title)]), follow=True) self.assertEqual(result.status_code, 200) + + def test_filter_topic(self): + """Test filters for solved topic or not""" + user1 = ProfileFactory().user + topic = TopicFactory(forum=self.forum11, author=self.user, is_solved=False, is_sticky=False) + topic_solved = TopicFactory(forum=self.forum11, author=self.user, is_solved=True, is_sticky=False) + topic_sticky = TopicFactory(forum=self.forum11, author=self.user, is_solved=False, is_sticky=True) + topic_solved_sticky = TopicFactory(forum=self.forum11, author=self.user, is_solved=True, is_sticky=True) + + self.assertEqual(len(get_topics(forum_pk=self.forum11.pk, is_sticky=False, is_solved=False)), 1) + self.assertEqual(get_topics(forum_pk=self.forum11.pk, is_sticky=False, is_solved=False)[0], topic) + + self.assertEqual(len(get_topics(forum_pk=self.forum11.pk, is_sticky=False, is_solved=True)), 1) + self.assertEqual(get_topics(forum_pk=self.forum11.pk, is_sticky=False, is_solved=True)[0], topic_solved) + + self.assertEqual(len(get_topics(forum_pk=self.forum11.pk, is_sticky=True, is_solved=False)), 1) + self.assertEqual(get_topics(forum_pk=self.forum11.pk, is_sticky=True, is_solved=False)[0], topic_sticky) + + self.assertEqual(len(get_topics(forum_pk=self.forum11.pk, is_sticky=True, is_solved=True)), 1) + self.assertEqual(get_topics(forum_pk=self.forum11.pk, is_sticky=True, is_solved=True)[0], topic_solved_sticky) + + self.assertEqual(len(get_topics(forum_pk=self.forum11.pk, is_sticky=False)), 2) + self.assertEqual(len(get_topics(forum_pk=self.forum11.pk, is_sticky=True)), 2) + \ No newline at end of file diff --git a/zds/forum/views.py b/zds/forum/views.py index 271e742772..4615d1eadf 100644 --- a/zds/forum/views.py +++ b/zds/forum/views.py @@ -26,7 +26,7 @@ from forms import TopicForm, PostForm, MoveTopicForm from models import Category, Forum, Topic, Post, follow, follow_by_email, never_read, \ - mark_read, TopicFollowed, sub_tag + mark_read, TopicFollowed, sub_tag, get_topics from zds.forum.models import TopicRead from zds.member.decorator import can_write_and_read_now from zds.member.views import get_client_ip @@ -54,30 +54,18 @@ def details(request, cat_slug, forum_slug): forum = get_object_or_404(Forum, slug=forum_slug) if not forum.can_read(request.user): raise PermissionDenied - sticky_topics = Topic.objects.filter(forum__pk=forum.pk, is_sticky=True).order_by( - "-last_message__pubdate").prefetch_related("author", "last_message", "tags").all() if "filter" in request.GET: filter = request.GET["filter"] - if request.GET["filter"] == "solve": - topics = Topic.objects.filter( - forum__pk=forum.pk, - is_sticky=False, - is_solved=True).order_by("-last_message__pubdate").prefetch_related( - "author", - "last_message", - "tags").all() + if filter == "solve": + sticky_topics = get_topics(forum_pk=forum.pk, is_sticky=True, is_solved=True) + topics = get_topics(forum_pk=forum.pk, is_sticky=False, is_solved=True) else: - topics = Topic.objects.filter( - forum__pk=forum.pk, - is_sticky=False, - is_solved=False).order_by("-last_message__pubdate").prefetch_related( - "author", - "last_message", - "tags").all() + sticky_topics = get_topics(forum_pk=forum.pk, is_sticky=True, is_solved=False) + topics = get_topics(forum_pk=forum.pk, is_sticky=False, is_solved=False) else: filter = None - topics = Topic.objects.filter(forum__pk=forum.pk, is_sticky=False) .order_by( - "-last_message__pubdate").prefetch_related("author", "last_message", "tags").all() + sticky_topics = get_topics(forum_pk=forum.pk, is_sticky=True) + topics = get_topics(forum_pk=forum.pk, is_sticky=False) # Paginator @@ -163,9 +151,13 @@ def topic(request, topic_pk, topic_slug): # The category list is needed to move threads categories = Category.objects.all() - try: - page_nbr = int(request.GET["page"]) - except KeyError: + if "page" in request.GET: + try: + page_nbr = int(request.GET["page"]) + except: + # problem in variable format + raise Http404 + else: page_nbr = 1 try: posts = paginator.page(page_nbr) @@ -211,7 +203,7 @@ def get_tag_by_title(title): continue_parsing_tags = True original_title = title for char in title: - + if char == u"[" and nb_bracket == 0 and continue_parsing_tags: nb_bracket += 1 elif nb_bracket > 0 and char != u"]" and continue_parsing_tags: @@ -245,7 +237,8 @@ def new(request): try: forum_pk = request.GET["forum"] - except KeyError: + except: + # problem in variable format raise Http404 forum = get_object_or_404(Forum, pk=forum_pk) if not forum.can_read(request.user): @@ -324,7 +317,7 @@ def solve_alert(request): u'Vous recevez ce message car vous avez signalé le message de *{1}*, ' u'dans le sujet [{2}]({3}). Votre alerte a été traitée par **{4}** ' u'et il vous a laissé le message suivant :' - u'\n\n`{5}`\n\nToute l\'équipe de la modération vous remercie'.format( + u'\n\n> {5}\n\nToute l\'équipe de la modération vous remercie !'.format( alert.author.username, post.author.username, post.topic.title, @@ -356,7 +349,8 @@ def move_topic(request): raise PermissionDenied try: topic_pk = request.GET["sujet"] - except KeyError: + except: + # problem in variable format raise Http404 forum = get_object_or_404(Forum, pk=request.POST["forum"]) if not forum.can_read(request.user): @@ -386,12 +380,18 @@ def edit(request): try: topic_pk = request.POST["topic"] - except KeyError: + except: + # problem in variable format raise Http404 - try: - page = int(request.POST["page"]) - except KeyError: + if "page" in request.POST: + try: + page = int(request.POST["page"]) + except: + #problem in variable format + raise Http404 + else: page = 1 + data = request.POST resp = {} g_topic = get_object_or_404(Topic, pk=topic_pk) @@ -421,7 +421,8 @@ def edit(request): if "move" in data: try: forum_pk = int(request.POST["move_target"]) - except KeyError: + except: + # problem in variable format raise Http404 forum = get_object_or_404(Forum, pk=forum_pk) g_topic.forum = forum @@ -444,7 +445,8 @@ def answer(request): try: topic_pk = request.GET["sujet"] - except KeyError: + except: + # problem in variable format raise Http404 # Retrieve current topic. @@ -601,7 +603,8 @@ def edit_post(request): try: post_pk = request.GET["message"] - except KeyError: + except: + # problem in variable format raise Http404 post = get_object_or_404(Post, pk=post_pk) if not post.topic.forum.can_read(request.user): @@ -727,7 +730,8 @@ def useful_post(request): try: post_pk = request.GET["message"] - except KeyError: + except: + # problem in variable format raise Http404 post = get_object_or_404(Post, pk=post_pk) @@ -753,7 +757,8 @@ def unread_post(request): try: post_pk = request.GET["message"] - except KeyError: + except: + # problem in variable format raise Http404 post = get_object_or_404(Post, pk=post_pk) @@ -787,7 +792,8 @@ def like_post(request): try: post_pk = request.GET["message"] - except KeyError: + except: + # problem in variable format raise Http404 resp = {} post = get_object_or_404(Post, pk=post_pk) @@ -834,7 +840,8 @@ def dislike_post(request): try: post_pk = request.GET["message"] - except KeyError: + except: + # problem in variable format raise Http404 resp = {} post = get_object_or_404(Post, pk=post_pk) @@ -885,7 +892,6 @@ def find_topic_by_tag(request, tag_pk, tag_slug): if request.GET["filter"] == "solve": topics = Topic.objects.filter( tags__in=[tag], - is_sticky=False, is_solved=True).order_by("-last_message__pubdate").prefetch_related( "author", "last_message", @@ -895,7 +901,6 @@ def find_topic_by_tag(request, tag_pk, tag_slug): else: topics = Topic.objects.filter( tags__in=[tag], - is_sticky=False, is_solved=False).order_by("-last_message__pubdate").prefetch_related( "author", "last_message", @@ -904,8 +909,7 @@ def find_topic_by_tag(request, tag_pk, tag_slug): .all() else: filter = None - topics = Topic.objects.filter(tags__in=[tag], is_sticky=False) .order_by( - "-last_message__pubdate")\ + topics = Topic.objects.filter(tags__in=[tag]).order_by("-last_message__pubdate")\ .exclude(Q(forum__group__isnull=False) & ~Q(forum__group__in=u.groups.all()))\ .prefetch_related("author", "last_message", "tags").all() # Paginator diff --git a/zds/member/factories.py b/zds/member/factories.py index a7388ad5c6..609968a267 100644 --- a/zds/member/factories.py +++ b/zds/member/factories.py @@ -1,3 +1,5 @@ +# coding: utf-8 + from django.contrib.auth.models import User, Permission import factory @@ -92,3 +94,15 @@ def biography(self): self.user.username.lower()) sign = 'Please look my flavour' + + +class NonAsciiUserFactory(UserFactory): + FACTORY_FOR = User + + username = factory.Sequence(lambda n: u'ïéàçÊÀ{0}'.format(n)) + + +class NonAsciiProfileFactory(ProfileFactory): + FACTORY_FOR = Profile + + user = factory.SubFactory(NonAsciiUserFactory) diff --git a/zds/member/forms.py b/zds/member/forms.py index 06876bd047..4eff50eacf 100644 --- a/zds/member/forms.py +++ b/zds/member/forms.py @@ -4,9 +4,11 @@ from django import forms from django.contrib.auth import authenticate -from django.contrib.auth.models import User +from django.contrib.auth.models import User, Group from django.core.urlresolvers import reverse +from email.utils import parseaddr + from crispy_forms.bootstrap import StrictButton from crispy_forms.helper import FormHelper from crispy_forms.layout import HTML, Layout, \ @@ -50,22 +52,24 @@ class LoginForm(forms.Form): label='Identifiant', max_length=User._meta.get_field('username').max_length, required=True, + widget=forms.TextInput( + attrs={ + 'autofocus': '' + } + ) ) password = forms.CharField( label='Mot magique', max_length=MAX_PASSWORD_LENGTH, + min_length=MIN_PASSWORD_LENGTH, required=True, widget=forms.PasswordInput, ) - remember = forms.MultipleChoiceField( - label='', - choices=( - ('remember', "Connexion automatique"), - ), - initial='remember', - widget=forms.CheckboxSelectMultiple, + remember = forms.BooleanField( + label='Connexion automatique', + initial=True, ) def __init__(self, next=None, *args, **kwargs): @@ -151,18 +155,30 @@ def clean(self): # Check that the user doesn't exist yet username = cleaned_data.get('username') - if User.objects.filter(username=username).count() > 0: - msg = u'Ce nom d\'utilisateur est déjà utilisé' - self._errors['username'] = self.error_class([msg]) - - # Check that password != username - if password == username: - msg = u'Le mot de passe doit être différent du pseudo' - self._errors['password'] = self.error_class([msg]) - if 'password' in cleaned_data: - del cleaned_data['password'] - if 'password_confirm' in cleaned_data: - del cleaned_data['password_confirm'] + + if username is not None : + if username.strip() == '': + msg = u'Le nom d\'utilisateur ne peut-être vide' + self._errors['username'] = self.error_class([msg]) + elif User.objects.filter(username=username).count() > 0: + msg = u'Ce nom d\'utilisateur est déjà utilisé' + self._errors['username'] = self.error_class([msg]) + # Forbid the use of comma in the username + elif "," in username: + msg = u'Le nom d\'utilisateur ne peut contenir de virgules' + self._errors['username'] = self.error_class([msg]) + elif username != username.strip(): + msg = u'Le nom d\'utilisateur ne peut commencer/finir par des espaces' + self._errors['username'] = self.error_class([msg]) + + # Check that password != username + if password == username: + msg = u'Le mot de passe doit être différent du pseudo' + self._errors['password'] = self.error_class([msg]) + if 'password' in cleaned_data: + del cleaned_data['password'] + if 'password_confirm' in cleaned_data: + del cleaned_data['password_confirm'] email = cleaned_data.get('email') if email: @@ -175,10 +191,10 @@ def clean(self): self._errors['email'] = self.error_class([msg]) break - # Check that the email is unique - if User.objects.filter(email=email).count() > 0: - msg = u'Votre adresse courriel est déjà utilisée' - self._errors['email'] = self.error_class([msg]) + # Check that the email is unique + if User.objects.filter(email=email).count() > 0: + msg = u'Votre adresse courriel est déjà utilisée' + self._errors['email'] = self.error_class([msg]) return cleaned_data @@ -241,13 +257,12 @@ def __init__(self, *args, **kwargs): Field('avatar_url'), Field('sign'), ButtonHolder( - StrictButton('Editer le profil', type='submit'), + StrictButton('Éditer le profil', type='submit'), HTML('Annuler'), )) -# update extra information about user - +# update extra information about user class ProfileForm(MiniProfileForm): options = forms.MultipleChoiceField( label='', @@ -300,9 +315,8 @@ def __init__(self, *args, **kwargs): HTML('Annuler'), )) -# to update email/username - +# to update email/username class ChangeUserForm(forms.Form): username_new = forms.CharField( @@ -325,7 +339,8 @@ class ChangeUserForm(forms.Form): attrs={ 'placeholder': 'Ne mettez rien pour conserver l\'ancien' } - ) + ), + error_messages = {'invalid': u'Veuillez entrer une adresse email valide.',} ) def __init__(self, *args, **kwargs): @@ -351,25 +366,31 @@ def clean(self): email_new = cleaned_data.get('email_new') if username_new is not None: - if username_new.strip() != '': - if User.objects.filter(username=username_new).count() >= 1: + if username_new != '': + if User.objects.filter(username=username_new.strip()).count() >= 1: self._errors['username_new'] = self.error_class( [u'Ce nom d\'utilisateur est déjà utilisé']) + elif username_new != username_new.strip(): + msg = u'Le nom d\'utilisateur ne peut commencer/finir par des espaces' + self._errors['username_new'] = self.error_class([msg]) + # Forbid the use of comma in the username + elif "," in username_new: + msg = u'Le nom d\'utilisateur ne peut contenir de virgules' + self._errors['username_new'] = self.error_class([msg]) if email_new is not None: if email_new.strip() != '': if User.objects.filter(email=email_new).count() >= 1: - self._errors['email_new'] = self.error_class( - [u'Votre adresse courriel est déjà utilisée']) - # Chech if email provider is authorized - with open(os.path.join(SITE_ROOT, - 'forbidden_email_providers.txt'), 'r') as fh: - for provider in fh: - if provider.strip() in email_new: - msg = u'Utilisez un autre fournisseur d\'adresses mail.' - self._errors['email_new'] = self.error_class([msg]) - break - + self._errors['email_new'] = self.error_class([u'Votre adresse courriel est déjà utilisée']) + else: + # Chech if email provider is authorized + with open(os.path.join(SITE_ROOT, 'forbidden_email_providers.txt'), 'r') as fh: + for provider in fh: + if provider.strip() in email_new: + msg = u'Utilisez un autre fournisseur d\'adresses mail.' + self._errors['email_new'] = self.error_class([msg]) + break + return cleaned_data @@ -378,18 +399,21 @@ class ChangePasswordForm(forms.Form): password_new = forms.CharField( label='Nouveau mot de passe', max_length=MAX_PASSWORD_LENGTH, + min_length=MIN_PASSWORD_LENGTH, widget=forms.PasswordInput ) password_old = forms.CharField( label='Mot de passe actuel', max_length=MAX_PASSWORD_LENGTH, + min_length=MIN_PASSWORD_LENGTH, widget=forms.PasswordInput ) password_confirm = forms.CharField( label='Confirmer le nouveau mot de passe', max_length=MAX_PASSWORD_LENGTH, + min_length=MIN_PASSWORD_LENGTH, widget=forms.PasswordInput ) @@ -442,16 +466,6 @@ def clean(self): if 'password_confirm' in cleaned_data: del cleaned_data['password_confirm'] - # Check that the password is at least MIN_PASSWORD_LENGTH - if len(password_new) < MIN_PASSWORD_LENGTH: - msg = u'Le mot de passe doit faire au moins {0} caractères'.format(MIN_PASSWORD_LENGTH) - self._errors['password_new'] = self.error_class([msg]) - if 'password_new' in cleaned_data: - del cleaned_data['password_new'] - - if 'password_confirm' in cleaned_data: - del cleaned_data['password_confirm'] - # Check that password != username if password_new == self.user.username: msg = u'Le mot de passe doit être différent de votre pseudo' @@ -464,9 +478,8 @@ def clean(self): return cleaned_data -# Reset the password - +# Reset the password class ForgotPasswordForm(forms.Form): username = forms.CharField( label='Nom d\'utilisateur', @@ -505,11 +518,13 @@ class NewPasswordForm(forms.Form): password = forms.CharField( label='Mot de passe', max_length=MAX_PASSWORD_LENGTH, + min_length=MIN_PASSWORD_LENGTH, widget=forms.PasswordInput ) password_confirm = forms.CharField( label='Confirmation', max_length=MAX_PASSWORD_LENGTH, + min_length=MIN_PASSWORD_LENGTH, widget=forms.PasswordInput ) @@ -547,16 +562,6 @@ def clean(self): if 'password_confirm' in cleaned_data: del cleaned_data['password_confirm'] - # Check that the password is at least MIN_PASSWORD_LENGTH - if len(password) < MIN_PASSWORD_LENGTH: - msg = u'Le mot de passe doit faire au moins {0} caractères'.format(MIN_PASSWORD_LENGTH) - self._errors['password'] = self.error_class([msg]) - if 'password' in cleaned_data: - del cleaned_data['password'] - - if 'password_confirm' in cleaned_data: - del cleaned_data['password_confirm'] - # Check that password != username if password == self.username: msg = u'Le mot de passe doit être différent de votre pseudo' @@ -568,3 +573,28 @@ def clean(self): del cleaned_data['password_confirm'] return cleaned_data + + +class PromoteMemberForm(forms.Form): + groups = forms.ModelMultipleChoiceField( + label="Groupe de l'utilisateur", + queryset=Group.objects.all(), + required=False, + ) + + superuser = forms.BooleanField( + label="Super-user", + required=False, + ) + + def __init__(self, *args, **kwargs): + super(PromoteMemberForm, self).__init__(*args, **kwargs) + self.helper = FormHelper() + self.helper.form_class = 'content-wrapper' + self.helper.form_method = 'post' + + self.helper.layout = Layout( + Field('groups'), + Field('superuser'), + StrictButton('Valider', type='submit'), + ) diff --git a/zds/member/models.py b/zds/member/models.py index 101db079a2..0b75e578ee 100644 --- a/zds/member/models.py +++ b/zds/member/models.py @@ -109,8 +109,8 @@ def get_city(self): 'GeoLiteCityv6.dat')) geo = gic.record_by_addr(self.last_ip_address) - return u'{0} ({1}) : {2}'.format( - geo['city'], geo['postal_code'], geo['country_name']) + return u'{0}, {1}'.format( + geo['city'], geo['country_name']) def get_avatar_url(self): """Avatar URL (using custom URL or Gravatar)""" diff --git a/zds/newsletter/__init__.py b/zds/member/tests/__init__.py similarity index 100% rename from zds/newsletter/__init__.py rename to zds/member/tests/__init__.py diff --git a/zds/member/tests/tests_forms.py b/zds/member/tests/tests_forms.py new file mode 100644 index 0000000000..e91a293d04 --- /dev/null +++ b/zds/member/tests/tests_forms.py @@ -0,0 +1,504 @@ +# coding: utf-8 + +from django.conf import settings +from django.contrib.auth.models import User +from django.core import mail +from django.test import TestCase + +from zds.member.factories import ProfileFactory, StaffProfileFactory +from zds.member.forms import OldTutoForm, LoginForm, RegisterForm, \ + MiniProfileForm, ProfileForm, ChangeUserForm, \ + ChangePasswordForm, ForgotPasswordForm, NewPasswordForm + +stringof77chars = "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789-----" +stringof129chars = u'http://www.01234567890123456789123456789' \ + u'0123456789012345678901234567890123456789' \ + u'0123456789012345678901234567890123456789' \ + u'012345678' +stringof251chars = u'abcdefghijklmnopqrstuvwxyabcdefghijklmnopqrstuvwxy' \ + u'abcdefghijklmnopqrstuvwxyabcdefghijklmnopqrstuvwxy' \ + u'abcdefghijklmnopqrstuvwxyabcdefghijklmnopqrstuvwxy' \ + u'abcdefghijklmnopqrstuvwxyabcdefghijklmnopqrstuvwxy' \ + u'abcdefghijklmnopqrstuvwxyabcdefghijklmnopqrstuvwxy0' + + +# This form is tricky to test as it needs a tuto to be done +# class OldTutoFormTest(TestCase): + + +class LoginFormTest(TestCase): + """ Check the form to login """ + + def test_valid_login_form(self): + data = { + 'username': 'Tester', + 'password': 'hostel77', + 'remember': True + } + form = LoginForm(data=data) + self.assertTrue(form.is_valid()) + + def test_missing_username_form(self): + data = { + 'username': '', + 'password': 'hostel77', + 'remember': True + } + form = LoginForm(data=data) + self.assertFalse(form.is_valid()) + + def test_missing_password_form(self): + data = { + 'username': 'Tester', + 'password': '', + 'remember': True + } + form = LoginForm(data=data) + self.assertFalse(form.is_valid()) + + +class RegisterFormTest(TestCase): + """ Check the registering form """ + + def test_valid_register_form(self): + data = { + 'email': 'test@gmail.com', + 'username': 'ZeTester', + 'password': 'ZePassword', + 'password_confirm': 'ZePassword' + } + form = RegisterForm(data=data) + self.assertTrue(form.is_valid()) + + def test_empty_email_register_form(self): + data = { + 'email': '', + 'username': 'ZeTester', + 'password': 'ZePassword', + 'password_confirm': 'ZePassword' + } + form = RegisterForm(data=data) + self.assertFalse(form.is_valid()) + + def test_empty_pseudo_register_form(self): + data = { + 'email': 'test@gmail.com', + 'username': '', + 'password': 'ZePassword', + 'password_confirm': 'ZePassword' + } + form = RegisterForm(data=data) + self.assertFalse(form.is_valid()) + + def test_empty_spaces_pseudo_register_form(self): + data = { + 'email': 'test@gmail.com', + 'username': ' ', + 'password': 'ZePassword', + 'password_confirm': 'ZePassword' + } + form = RegisterForm(data=data) + self.assertFalse(form.is_valid()) + + def test_forbiden_email_provider_register_form(self): + data = { + 'email': 'test@yopmail.com', + 'username': 'ZeTester', + 'password': 'ZePassword', + 'password_confirm': 'ZePassword' + } + form = RegisterForm(data=data) + self.assertFalse(form.is_valid()) + + def test_not_matching_password_register_form(self): + data = { + 'email': 'test@gmail.com', + 'username': 'ZeTester', + 'password': 'ZePass', + 'password_confirm': 'ZePassword' + } + form = RegisterForm(data=data) + self.assertFalse(form.is_valid()) + + def test_too_short_password_register_form(self): + data = { + 'email': 'test@gmail.com', + 'username': 'ZeTester', + 'password': 'pass', + 'password_confirm': 'pass' + } + form = RegisterForm(data=data) + self.assertFalse(form.is_valid()) + + def test_too_long_password_register_form(self): + data = { + 'email': 'test@gmail.com', + 'username': 'ZeTester', + 'password': stringof77chars, + 'password_confirm': stringof77chars + } + form = RegisterForm(data=data) + self.assertFalse(form.is_valid()) + + def test_password_match_pseudo_password_register_form(self): + data = { + 'email': 'test@gmail.com', + 'username': 'ZeTester', + 'password': 'ZeTester', + 'password_confirm': 'ZeTester' + } + form = RegisterForm(data=data) + self.assertFalse(form.is_valid()) + + def test_password_match_pseudo_password_register_form(self): + data = { + 'email': 'test@gmail.com', + 'username': 'ZeTester', + 'password': 'ZeTester', + 'password_confirm': 'ZeTester' + } + form = RegisterForm(data=data) + self.assertFalse(form.is_valid()) + + def test_pseudo_exist_register_form(self): + testuser = ProfileFactory() + data = { + 'email': 'test@gmail.com', + 'username': testuser.user.username, + 'password': 'ZeTester', + 'password_confirm': 'ZeTester' + } + form = RegisterForm(data=data) + self.assertFalse(form.is_valid()) + + def test_email_exist_register_form(self): + testuser = ProfileFactory() + data = { + 'email': testuser.user.email, + 'username': 'ZeTester', + 'password': 'ZeTester', + 'password_confirm': 'ZeTester' + } + form = RegisterForm(data=data) + self.assertFalse(form.is_valid()) + + def test_pseudo_espaces_register_form(self): + testuser = ProfileFactory() + data = { + 'email': 'test@gmail.com', + 'username': ' ZeTester ', + 'password': 'ZePassword', + 'password_confirm': 'ZePassword' + } + form = RegisterForm(data=data) + self.assertFalse(form.is_valid()) + + def test_pseudo_coma_register_form(self): + testuser = ProfileFactory() + data = { + 'email': 'test@gmail.com', + 'username': 'Ze,Tester', + 'password': 'ZePassword', + 'password_confirm': 'ZePassword' + } + form = RegisterForm(data=data) + self.assertFalse(form.is_valid()) + + +class MiniProfileFormTest(TestCase): + """ Check the miniprofile form """ + + def setUp(self): + self.user1 = ProfileFactory() + + def test_valid_change_miniprofile_form(self): + data = { + 'biography': '', + 'site': '', + 'avatar_url': '', + 'sign': '' + } + form = MiniProfileForm(data=data) + self.assertTrue(form.is_valid()) + + def test_too_long_site_url_miniprofile_form(self): + data = { + 'biography': '', + 'site': stringof129chars, + 'avatar_url': '', + 'sign': '' + } + form = MiniProfileForm(data=data) + self.assertFalse(form.is_valid()) + + def test_too_long_avatar_url_miniprofile_form(self): + data = { + 'biography': '', + 'site': '', + 'avatar_url': stringof129chars, + 'sign': '' + } + form = MiniProfileForm(data=data) + self.assertFalse(form.is_valid()) + + def test_too_long_signature_miniprofile_form(self): + data = { + 'biography': '', + 'site': '', + 'avatar_url': '', + 'sign': stringof251chars + } + form = MiniProfileForm(data=data) + self.assertFalse(form.is_valid()) + + +class ProfileFormTest(TestCase): + """ Check the form is working (and that's all) """ + + def test_valid_profile_form(self): + data = {} + form = ProfileForm(data=data) + self.assertTrue(form.is_valid()) + + +class ChangeUserFormTest(TestCase): + """ Check the user pseudo/email """ + + def setUp(self): + self.user1 = ProfileFactory() + + def test_valid_change_pseudo_user_form(self): + data = { + 'username_new': "MyNewPseudo", + 'email_new': '' + } + form = ChangeUserForm(data=data) + self.assertTrue(form.is_valid()) + + def test_valid_change_email_user_form(self): + data = { + 'username_new': '', + 'email_new': 'test@gmail.com' + } + form = ChangeUserForm(data=data) + self.assertTrue(form.is_valid()) + + def test_already_used_username_user_form(self): + data = { + 'username_new': self.user1.user.username, + 'email_new': '' + } + form = ChangeUserForm(data=data) + self.assertFalse(form.is_valid()) + + def test_already_used_email_user_form(self): + data = { + 'username_new': '', + 'email_new': self.user1.user.email + } + form = ChangeUserForm(data=data) + self.assertFalse(form.is_valid()) + + def test_forbidden_email_provider_user_form(self): + data = { + 'username_new': '', + 'email_new': 'test@yopmail.com' + } + form = ChangeUserForm(data=data) + self.assertFalse(form.is_valid()) + + def test_wrong_email_user_form(self): + data = { + 'username_new': '', + 'email_new': 'wrong@' + } + form = ChangeUserForm(data=data) + self.assertFalse(form.is_valid()) + + data = { + 'username_new': '', + 'email_new': '@test.com' + } + form = ChangeUserForm(data=data) + self.assertFalse(form.is_valid()) + + data = { + 'username_new': '', + 'email_new': 'wrong@test' + } + form = ChangeUserForm(data=data) + self.assertFalse(form.is_valid()) + + data = { + 'username_new': '', + 'email_new': 'wrong@.com' + } + form = ChangeUserForm(data=data) + self.assertFalse(form.is_valid()) + + data = { + 'username_new': '', + 'email_new': 'wrongtest.com' + } + form = ChangeUserForm(data=data) + self.assertFalse(form.is_valid()) + + def test_pseudo_espaces_register_form(self): + testuser = ProfileFactory() + data = { + 'username_new': ' ZeTester ', + 'email_new': '' + } + form = ChangeUserForm(data=data) + self.assertFalse(form.is_valid()) + + def test_pseudo_coma_register_form(self): + testuser = ProfileFactory() + data = { + 'username_new': 'Ze,Tester', + 'email_new': '' + } + form = ChangeUserForm(data=data) + self.assertFalse(form.is_valid()) + +class ChangePasswordFormTest(TestCase): + """ Check the form to change the password """ + + def setUp(self): + self.user1 = ProfileFactory() + self.oldpassword = "hostel77" + self.newpassword = "TheNewPassword" + + def test_valid_change_password_form(self): + data = { + 'password_old': self.oldpassword, + 'password_new': self.newpassword, + 'password_confirm': self.newpassword + } + form = ChangePasswordForm(data=data, user=self.user1.user) + self.assertTrue(form.is_valid()) + + def test_old_wrong_change_password_form(self): + data = { + 'password_old': 'Wronnnng', + 'password_new': self.newpassword, + 'password_confirm': self.newpassword + } + form = ChangePasswordForm(data=data, user=self.user1.user) + self.assertFalse(form.is_valid()) + + def test_not_matching_change_password_form(self): + data = { + 'password_old': self.oldpassword, + 'password_new': self.newpassword, + 'password_confirm': 'Wronnnng' + } + form = ChangePasswordForm(data=data, user=self.user1.user) + self.assertFalse(form.is_valid()) + + def test_too_short_change_password_form(self): + tooshort = "short" + data = { + 'password_old': self.oldpassword, + 'password_new': tooshort, + 'password_confirm': tooshort + } + form = ChangePasswordForm(data=data, user=self.user1.user) + self.assertFalse(form.is_valid()) + + def test_too_long_change_password_form(self): + data = { + 'password_old': self.oldpassword, + 'password_new': stringof77chars, + 'password_confirm': stringof77chars + } + form = ChangePasswordForm(data=data, user=self.user1.user) + self.assertFalse(form.is_valid()) + + def test_match_pseudo_change_password_form(self): + self.user1.user.username = "LongName" + data = { + 'password_old': self.oldpassword, + 'password_new': self.user1.user.username, + 'password_confirm': self.user1.user.username + } + form = ChangePasswordForm(data=data, user=self.user1.user) + self.assertFalse(form.is_valid()) + + +class ForgotPasswordFormTest(TestCase): + """ Check the form to ask for a new password """ + + def setUp(self): + self.user1 = ProfileFactory() + + def test_valid_forgot_password_form(self): + data = { + 'username': self.user1.user.username + } + form = ForgotPasswordForm(data=data) + self.assertTrue(form.is_valid()) + + def test_empty_name_forgot_password_form(self): + data = { + 'username': '' + } + form = ForgotPasswordForm(data=data) + self.assertFalse(form.is_valid()) + + def test_unknow_name_forgot_password_form(self): + data = { + 'username': "John Doe" + } + form = ForgotPasswordForm(data=data) + self.assertFalse(form.is_valid()) + + +class NewPasswordFormTest(TestCase): + """ Check the form to input the new password """ + + def setUp(self): + self.user1 = ProfileFactory() + self.newpassword = "TheNewPassword" + + def test_valid_new_password_form(self): + data = { + 'password': self.newpassword, + 'password_confirm': self.newpassword + } + form = NewPasswordForm(data=data, identifier=self.user1.user.username) + self.assertTrue(form.is_valid()) + + def test_not_matching_new_password_form(self): + data = { + 'password': self.newpassword, + 'password_confirm': "Wronnngggg" + } + form = NewPasswordForm(data=data, identifier=self.user1.user.username) + self.assertFalse(form.is_valid()) + + def test_password_is_username_new_password_form(self): + data = { + 'password': self.user1.user.username, + 'password_confirm': self.user1.user.username + } + form = NewPasswordForm(data=data, identifier=self.user1.user.username) + self.assertFalse(form.is_valid()) + + def test_password_too_short_new_password_form(self): + tooshort = "short" + data = { + 'password': tooshort, + 'password_confirm': tooshort + } + form = NewPasswordForm(data=data, identifier=self.user1.user.username) + self.assertFalse(form.is_valid()) + + def test_password_too_long_new_password_form(self): + toolong = "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789-----" + data = { + 'password': toolong, + 'password_confirm': toolong + } + form = NewPasswordForm(data=data, identifier=self.user1.user.username) + self.assertFalse(form.is_valid()) diff --git a/zds/member/tests/tests_models.py b/zds/member/tests/tests_models.py new file mode 100644 index 0000000000..84467af323 --- /dev/null +++ b/zds/member/tests/tests_models.py @@ -0,0 +1,308 @@ +# coding: utf-8 + +import os +import shutil + +from datetime import datetime, timedelta + +from django.conf import settings +from django.contrib.auth.models import User +from django.core import mail +from django.test import TestCase +from django.test.utils import override_settings +from hashlib import md5 + +from zds.article.factories import ArticleFactory +from zds.forum.factories import CategoryFactory, ForumFactory, TopicFactory, PostFactory +from zds.forum.models import TopicFollowed +from zds.member.factories import ProfileFactory, StaffProfileFactory +from zds.member.models import Profile, TokenForgotPassword, TokenRegister +from zds.tutorial.factories import MiniTutorialFactory +from zds.tutorial.models import Validation +from zds.gallery.factories import GalleryFactory +from zds.utils.models import Alert, Comment +from zds.settings import SITE_ROOT + +@override_settings(MEDIA_ROOT=os.path.join(SITE_ROOT, 'media-test')) +@override_settings(REPO_PATH=os.path.join(SITE_ROOT, 'tutoriels-private-test')) +@override_settings( + REPO_PATH_PROD=os.path.join( + SITE_ROOT, + 'tutoriels-public-test')) +@override_settings( + REPO_ARTICLE_PATH=os.path.join( + SITE_ROOT, + 'articles-data-test')) +class TestProfile(TestCase): + def setUp(self): + self.user1 = ProfileFactory() + self.staff = StaffProfileFactory() + + # Create a forum for later test + self.forumcat = CategoryFactory() + self.forum = ForumFactory(category=self.forumcat) + self.forumtopic = TopicFactory(forum=self.forum, author=self.staff.user) + + def test_unicode(self): + self.assertEqual(self.user1.__unicode__(), self.user1.user.username) + + def test_get_absolute_url(self): + self.assertEqual(self.user1.get_absolute_url(), '/membres/voir/{0}/'.format(self.user1.user.username)) + + # def test_get_city(self): + + def test_get_avatar_url(self): + # if no url was specified -> gravatar ! + self.assertEqual(self.user1.get_avatar_url(), + 'https://secure.gravatar.com/avatar/{0}?d=identicon'. + format(md5(self.user1.user.email.lower()).hexdigest())) + # if an url is specified -> take it ! + user2 = ProfileFactory() + testurl = 'http://test.com/avatar.jpg' + user2.avatar_url = testurl + self.assertEqual(user2.get_avatar_url(), testurl) + + def test_get_post_count(self): + # Start with 0 + self.assertEqual(self.user1.get_post_count(), 0) + # Post ! + PostFactory(topic=self.forumtopic, author=self.user1.user, position=1) + # Should be 1 + self.assertEqual(self.user1.get_post_count(), 1) + + def test_get_topic_count(self): + # Start with 0 + self.assertEqual(self.user1.get_topic_count(), 0) + # Create Topic ! + TopicFactory(forum=self.forum, author=self.user1.user) + # Should be 1 + self.assertEqual(self.user1.get_topic_count(), 1) + + def test_get_tuto_count(self): + # Start with 0 + self.assertEqual(self.user1.get_tuto_count(), 0) + # Create Tuto ! + minituto = MiniTutorialFactory() + minituto.authors.add(self.user1.user) + minituto.gallery = GalleryFactory() + minituto.save() + # Should be 1 + self.assertEqual(self.user1.get_tuto_count(), 1) + + def test_get_tutos(self): + # Start with 0 + self.assertEqual(len(self.user1.get_tutos()), 0) + # Create Tuto ! + minituto = MiniTutorialFactory() + minituto.authors.add(self.user1.user) + minituto.gallery = GalleryFactory() + minituto.save() + # Should be 1 + tutos = self.user1.get_tutos() + self.assertEqual(len(tutos), 1) + self.assertEqual(minituto, tutos[0]) + + def test_get_draft_tutos(self): + # Start with 0 + self.assertEqual(len(self.user1.get_draft_tutos()), 0) + # Create Tuto ! + drafttuto = MiniTutorialFactory() + drafttuto.authors.add(self.user1.user) + drafttuto.gallery = GalleryFactory() + drafttuto.save() + # Should be 1 + drafttutos = self.user1.get_draft_tutos() + self.assertEqual(len(drafttutos), 1) + self.assertEqual(drafttuto, drafttutos[0]) + + def test_get_public_tutos(self): + # Start with 0 + self.assertEqual(len(self.user1.get_public_tutos()), 0) + # Create Tuto ! + publictuto = MiniTutorialFactory() + publictuto.authors.add(self.user1.user) + publictuto.gallery = GalleryFactory() + publictuto.sha_public = 'whatever' + publictuto.save() + # Should be 1 + publictutos = self.user1.get_public_tutos() + self.assertEqual(len(publictutos), 1) + self.assertEqual(publictuto, publictutos[0]) + + def test_get_validate_tutos(self): + # Start with 0 + self.assertEqual(len(self.user1.get_validate_tutos()), 0) + # Create Tuto ! + validatetuto = MiniTutorialFactory() + validatetuto.authors.add(self.user1.user) + validatetuto.gallery = GalleryFactory() + validatetuto.sha_validation = 'whatever' + validatetuto.save() + # Should be 1 + validatetutos = self.user1.get_validate_tutos() + self.assertEqual(len(validatetutos), 1) + self.assertEqual(validatetuto, validatetutos[0]) + + def test_get_beta_tutos(self): + # Start with 0 + self.assertEqual(len(self.user1.get_beta_tutos()), 0) + # Create Tuto ! + betatetuto = MiniTutorialFactory() + betatetuto.authors.add(self.user1.user) + betatetuto.gallery = GalleryFactory() + betatetuto.sha_beta = 'whatever' + betatetuto.save() + # Should be 1 + betatetutos = self.user1.get_beta_tutos() + self.assertEqual(len(betatetutos), 1) + self.assertEqual(betatetuto, betatetutos[0]) + + def test_get_articles(self): + # Start with 0 + self.assertEqual(len(self.user1.get_articles()), 0) + # Create Tuto ! + article = ArticleFactory() + article.authors.add(self.user1.user) + article.save() + # Should be 1 + articles = self.user1.get_articles() + self.assertEqual(len(articles), 1) + self.assertEqual(article, articles[0]) + + def test_get_public_articles(self): + # Start with 0 + self.assertEqual(len(self.user1.get_public_articles()), 0) + # Create Tuto ! + article = ArticleFactory() + article.authors.add(self.user1.user) + article.sha_public = 'whatever' + article.save() + # Should be 1 + articles = self.user1.get_public_articles() + self.assertEqual(len(articles), 1) + self.assertEqual(article, articles[0]) + + def test_get_validate_articles(self): + # Start with 0 + self.assertEqual(len(self.user1.get_validate_articles()), 0) + # Create Tuto ! + article = ArticleFactory() + article.authors.add(self.user1.user) + article.sha_validation = 'whatever' + article.save() + # Should be 1 + articles = self.user1.get_validate_articles() + self.assertEqual(len(articles), 1) + self.assertEqual(article, articles[0]) + + def test_get_draft_articles(self): + # Start with 0 + self.assertEqual(len(self.user1.get_draft_articles()), 0) + # Create Tuto ! + article = ArticleFactory() + article.authors.add(self.user1.user) + article.sha_beta = 'whatever' + article.save() + # Should be 1 + articles = self.user1.get_draft_articles() + self.assertEqual(len(articles), 1) + self.assertEqual(article, articles[0]) + + def test_get_posts(self): + # Start with 0 + self.assertEqual(len(self.user1.get_posts()), 0) + # Post ! + apost = PostFactory(topic=self.forumtopic, author=self.user1.user, position=1) + # Should be 1 + posts = self.user1.get_posts() + self.assertEqual(len(posts), 1) + self.assertEqual(apost, posts[0]) + + def test_get_invisible_posts_count(self): + # Start with 0 + self.assertEqual(self.user1.get_invisible_posts_count(), 0) + # Post ! + PostFactory(topic=self.forumtopic, author=self.user1.user, position=1, is_visible=False) + # Should be 1 + self.assertEqual(self.user1.get_invisible_posts_count(), 1) + + def test_get_alerts_posts_count(self): + # Start with 0 + self.assertEqual(self.user1.get_alerts_posts_count(), 0) + # Post and Alert it ! + post = PostFactory(topic=self.forumtopic, author=self.user1.user, position=1) + Alert.objects.create(author=self.user1.user, comment=post, scope=Alert.FORUM, pubdate=datetime.now()) + # Should be 1 + self.assertEqual(self.user1.get_alerts_posts_count(), 1) + + def test_can_read_now(self): + self.user1.user.is_active = False + self.assertFalse(self.user1.can_write_now()) + self.user1.user.is_active = True + self.assertTrue(self.user1.can_write_now()) + # TODO Some conditions still need to be tested + + + def test_can_write_now(self): + self.user1.user.is_active = False + self.assertFalse(self.user1.can_write_now()) + self.user1.user.is_active = True + self.assertTrue(self.user1.can_write_now()) + # TODO Some conditions still need to be tested + + + def test_get_followed_topics(self): + # Start with 0 + self.assertEqual(len(self.user1.get_followed_topics()), 0) + # Follow ! + TopicFollowed.objects.create(topic=self.forumtopic, user=self.user1.user) + # Should be 1 + topicsfollowed = self.user1.get_followed_topics() + self.assertEqual(len(topicsfollowed), 1) + self.assertEqual(self.forumtopic, topicsfollowed[0]) + + def tearDown(self): + if os.path.isdir(settings.REPO_PATH): + shutil.rmtree(settings.REPO_PATH) + if os.path.isdir(settings.REPO_PATH_PROD): + shutil.rmtree(settings.REPO_PATH_PROD) + if os.path.isdir(settings.REPO_ARTICLE_PATH): + shutil.rmtree(settings.REPO_ARTICLE_PATH) + if os.path.isdir(settings.MEDIA_ROOT): + shutil.rmtree(settings.MEDIA_ROOT) + +class TestTokenForgotPassword(TestCase): + + def setUp(self): + self.user1 = ProfileFactory() + self.token = TokenForgotPassword.objects.create(user=self.user1.user, + token="abcde", + date_end=datetime.now()) + + def test_get_absolute_url(self): + self.assertEqual(self.token.get_absolute_url(), '/membres/new_password/?token={0}'.format(self.token.token)) + + +class TestTokenRegister(TestCase): + + def setUp(self): + self.user1 = ProfileFactory() + self.token = TokenRegister.objects.create(user=self.user1.user, + token="abcde", + date_end=datetime.now()) + + def test_get_absolute_url(self): + self.assertEqual(self.token.get_absolute_url(), '/membres/activation/?token={0}'.format(self.token.token)) + + def test_unicode(self): + self.assertEqual(self.token.__unicode__(), '{0} - {1}'.format(self.user1.user.username, self.token.date_end)) + + +# class TestBan(TestCase): +# nothing to test ! + + +# class TestDivers(TestCase): + # logout_user + # listing + # get_info_old_tuto diff --git a/zds/member/tests.py b/zds/member/tests/tests_views.py similarity index 55% rename from zds/member/tests.py rename to zds/member/tests/tests_views.py index de54bd7872..9271b137e6 100644 --- a/zds/member/tests.py +++ b/zds/member/tests/tests_views.py @@ -1,17 +1,18 @@ # coding: utf-8 +import urllib + from django.conf import settings from django.contrib.auth.models import User from django.core import mail from django.core.urlresolvers import reverse from django.test import TestCase -from zds.member.factories import ProfileFactory, StaffProfileFactory -from zds.member.forms import RegisterForm, ChangeUserForm, \ - ChangePasswordForm +from zds.member.factories import ProfileFactory, StaffProfileFactory, NonAsciiProfileFactory +from zds.member.forms import RegisterForm, ChangeUserForm, ChangePasswordForm from zds.member.models import Profile -from .models import TokenRegister, Ban +from zds.member.models import TokenRegister, Ban class MemberTests(TestCase): @@ -75,80 +76,6 @@ def test_register(self): self.assertTrue(User.objects.get(username='firm1').is_active) - # From this point we have a valid user (firm1 / firm1@zestedesavoir.com) - - # Now let's test all the failing cases !! - - # 1. If passwords don't match - form_data = { - 'username': 'TheUsername', - 'password': 'password', - 'password_confirm': 'flavour', - 'email': 'email@zestedesavoir.com' - } - form = RegisterForm(data=form_data) - self.assertFalse(form.is_valid()) - - # 2. If passwords are too shorts - form_data = { - 'username': 'TheUsername', - 'password': 'pass', - 'password_confirm': 'pass', - 'email': 'email@zestedesavoir.com' - } - form = RegisterForm(data=form_data) - self.assertFalse(form.is_valid()) - - # 3. If passwords are equal to username - form_data = { - 'username': 'TheUsername', - 'password': 'TheUsername', - 'password_confirm': 'TheUsername', - 'email': 'email@zestedesavoir.com' - } - form = RegisterForm(data=form_data) - self.assertFalse(form.is_valid()) - - # 4. If there is no username - form_data = { - 'username': '', - 'password': 'password', - 'password_confirm': 'password', - 'email': 'email@zestedesavoir.com' - } - form = RegisterForm(data=form_data) - self.assertFalse(form.is_valid()) - - # 5. If there is no email - form_data = { - 'username': 'TheUsername', - 'password': 'password', - 'password_confirm': 'password', - 'email': '' - } - form = RegisterForm(data=form_data) - self.assertFalse(form.is_valid()) - - # 6. If the username is already taken - form_data = { - 'username': 'firm1', - 'password': 'password', - 'password_confirm': 'password', - 'email': 'email@zestedesavoir.com' - } - form = RegisterForm(data=form_data) - self.assertFalse(form.is_valid()) - - # 7. If the email is already taken - form_data = { - 'username': 'TheUsername', - 'password': 'password', - 'password_confirm': 'password', - 'email': 'firm1@zestedesavoir.com' - } - form = RegisterForm(data=form_data) - self.assertFalse(form.is_valid()) - def test_sanctions(self): """Test various sanctions.""" @@ -271,122 +198,11 @@ def test_sanctions(self): self.assertEqual(ban.type, 'Ban Temporaire') self.assertEqual(ban.text, 'Texte de test pour BAN TEMP') self.assertEquals(len(mail.outbox), 6) - - def test_update_password(self): - """Test the password""" - - # create dummy user (to test) - user = ProfileFactory() - login_check = self.client.login( - username=user.user.username, - password='hostel77') - self.assertTrue(login_check) - - # 1. If passwords don't match - form_data = { - 'password_old': 'hostel77', - 'password_new': 'ThePassword1234', - 'password_confirm': 'TheWrongPassword' - } - form = ChangePasswordForm(user.user, data=form_data) - self.assertFalse(form.is_valid()) - # 2. If passwords are too shorts - form_data = { - 'password_old': 'hostel77', - 'password_new': 'pass', - 'password_confirm': 'pass' - } - form = ChangePasswordForm(user.user, data=form_data) - self.assertFalse(form.is_valid()) - - # 3. If passwords are equal to username - form_data = { - 'password_old': 'hostel77', - 'password_new': user.user.username, - 'password_confirm': user.user.username - } - form = ChangePasswordForm(user.user, data=form_data) - self.assertFalse(form.is_valid()) - - # 4. If old password is wrong - form_data = { - 'password_old': 'WrongPassword', - 'password_new': 'ThePassword1234', - 'password_confirm': 'ThePassword1234' - } - form = ChangePasswordForm(user.user, data=form_data) - self.assertFalse(form.is_valid()) - - # 5. If everything is OK - form_data = { - 'password_old': 'hostel77', - 'password_new': 'ThePassword1234', - 'password_confirm': 'ThePassword1234' - } - form = ChangePasswordForm(user.user, data=form_data) - self.assertTrue(form.is_valid()) + def test_nonascii(self): + user = NonAsciiProfileFactory() + result = self.client.get(reverse('zds.member.views.login_view') + '?next=' + + reverse('zds.member.views.details', args=[user.user.username]), + follow=False) + self.assertEqual(result.status_code, 200) - def test_update_profil(self): - """Test the profil update (pseudo, email)""" - - # create dummy user (reference) - user_ref = ProfileFactory() - login_check = self.client.login( - username=user_ref.user.username, - password='hostel77') - self.assertTrue(login_check) - - # create dummy user (to test) - user = ProfileFactory() - login_check = self.client.login( - username=user.user.username, - password='hostel77') - self.assertTrue(login_check) - - # A. Test email update ---- - - # A1. If email looks bad - form_data = { - 'email_new': 'weirdemail@' - } - form = ChangeUserForm(data=form_data) - self.assertFalse(form.is_valid()) - - # A2. If email is taken - form_data = { - 'email_new': user_ref.user.email - } - form = ChangeUserForm(data=form_data) - self.assertFalse(form.is_valid()) - - # A3. If email provider is forbidden - form_data = { - 'email_new': 'dummy@yopmail.com' - } - form = ChangeUserForm(data=form_data) - self.assertFalse(form.is_valid()) - - # A4. If OK - form_data = { - 'email_new': 'okmail@test.com' - } - form = ChangeUserForm(data=form_data) - self.assertTrue(form.is_valid()) - - # B. t*Test pseudo update --- - - # B1. If new pseudo is taken - form_data = { - 'username_new': user_ref.user.username - } - form = ChangeUserForm(data=form_data) - self.assertFalse(form.is_valid()) - - # B2. If new pseudo is OK - form_data = { - 'username_new': 'OriginalPseudo' - } - form = ChangeUserForm(data=form_data) - self.assertTrue(form.is_valid()) - diff --git a/zds/member/urls.py b/zds/member/urls.py index 45a60ca517..1a7957750e 100644 --- a/zds/member/urls.py +++ b/zds/member/urls.py @@ -33,6 +33,8 @@ 'zds.member.views.settings_account'), url(r'^parametres/user/$', 'zds.member.views.settings_user'), + url(r'^profil/promouvoir/(?P\d+)/$', + 'zds.member.views.settings_promote'), url(r'^connexion/$', 'zds.member.views.login_view'), diff --git a/zds/member/views.py b/zds/member/views.py index bfc4e5da18..c458ba5902 100644 --- a/zds/member/views.py +++ b/zds/member/views.py @@ -8,7 +8,7 @@ from django.contrib import messages from django.contrib.auth import authenticate, login, logout from django.contrib.auth.decorators import login_required -from django.contrib.auth.models import User, SiteProfileNotAvailable +from django.contrib.auth.models import User, Group, Permission, SiteProfileNotAvailable from django.core.context_processors import csrf from django.core.exceptions import PermissionDenied from django.core.mail import EmailMultiAlternatives @@ -26,12 +26,12 @@ from forms import LoginForm, MiniProfileForm, ProfileForm, RegisterForm, \ ChangePasswordForm, ChangeUserForm, ForgotPasswordForm, NewPasswordForm, \ - OldTutoForm + OldTutoForm, PromoteMemberForm from models import Profile, TokenForgotPassword, Ban, TokenRegister, \ get_info_old_tuto, logout_user from zds.gallery.forms import ImageAsAvatarForm from zds.article.models import Article -from zds.forum.models import Topic +from zds.forum.models import Topic, follow from zds.member.decorator import can_write_and_read_now from zds.tutorial.models import Tutorial from zds.utils import render_template @@ -40,13 +40,15 @@ from zds.utils.tokens import generate_token - def index(request): """Displays the list of registered users.""" if request.is_ajax(): q = request.GET.get('q', '') - members = User.objects.filter(username__icontains=q)[:20] + if request.user.is_authenticated() : + members = User.objects.filter(username__icontains=q).exclude(pk=request.user.pk)[:20] + else: + members = User.objects.filter(username__icontains=q)[:20] results = [] for member in members: member_json = {} @@ -55,9 +57,9 @@ def index(request): member_json['value'] = member.username results.append(member_json) data = json.dumps(results) - + mimetype = "application/json" - + return HttpResponse(data, mimetype) else: @@ -127,12 +129,12 @@ def details(request, user_name): my_tuto_versions = [] for my_tutorial in my_tutorials: mandata = my_tutorial.load_json_for_public() - mandata = my_tutorial.load_dic(mandata) + my_tutorial.load_dic(mandata) my_tuto_versions.append(mandata) my_article_versions = [] for my_article in my_articles: article_version = my_article.load_json_for_public() - article_version = my_article.load_dic(article_version) + my_article.load_dic(article_version) my_article_versions.append(article_version) my_topics = \ @@ -224,37 +226,29 @@ def modify_profile(request, user_pk): # send register message if "un-ls" in request.POST or "un-ban" in request.POST: - msg = \ - u"""Bonjour **{0}**, - -**Bonne Nouvelle**, la sanction qui pesait sur vous a été levée par **{1}**. - -Ce qui signifie que {2} - -Le motif de votre sanction est : - -`{3}` - -Cordialement, L'équipe Zeste de Savoir. - -""".format(ban.user, - ban.moderator, detail, ban.text) + msg = (u'Bonjour **{0}**,\n\n' + u'**Bonne Nouvelle**, la sanction qui ' + u'pesait sur vous a été levée par **{1}**.\n\n' + u'Ce qui signifie que {2}\n\n' + u'Le motif de votre sanction est :\n\n' + u'> {3}\n\n' + u'Cordialement, L\'équipe Zeste de Savoir.' + .format(ban.user, + ban.moderator, + detail, + ban.text)) else: - msg = \ - u"""Bonjour **{0}**, - -Vous avez été santionné par **{1}**. - -La sanction est de type *{2}*, ce qui signifie que {3} - -Le motif de votre sanction est : - -`{4}` - -Cordialement, L'équipe Zeste de Savoir. - -""".format(ban.user, - ban.moderator, ban.type, detail, ban.text) + msg = (u'Bonjour **{0}**,\n\n' + u'Vous avez été santionné par **{1}**.\n\n' + u'La sanction est de type *{2}*, ce qui signifie que {3}\n\n' + u'Le motif de votre sanction est :\n\n' + u'> {4}\n\n' + u'Cordialement, L\'équipe Zeste de Savoir.' + .format(ban.user, + ban.moderator, + ban.type, + detail, + ban.text)) bot = get_object_or_404(User, username=settings.BOT_ACCOUNT) send_mp( bot, @@ -286,6 +280,10 @@ def tutorials(request): profile = request.user.profile if type == "draft": user_tutorials = profile.get_draft_tutos() + elif type == "beta": + user_tutorials = profile.get_beta_tutos() + elif type == "validate": + user_tutorials = profile.get_validate_tutos() elif type == "public": user_tutorials = profile.get_public_tutos() else: @@ -313,6 +311,8 @@ def articles(request): profile = request.user.profile if type == "draft": user_articles = profile.get_draft_articles() + if type == "validate": + user_articles = profile.get_validate_articles() elif type == "public": user_articles = profile.get_public_articles() else: @@ -510,7 +510,6 @@ def settings_user(request): return render_template("member/settings/user.html", c) - def login_view(request): """Log in user.""" @@ -559,8 +558,9 @@ def login_view(request): messages.error(request, "Les identifiants fournis ne sont pas valides") form = LoginForm() - form.helper.form_action = reverse("zds.member.views.login_view") \ - + "?next=" + str(next_page) + form.helper.form_action = reverse("zds.member.views.login_view") + if next_page is not None: + form.helper.form_action += "?next=" + next_page csrf_tk["error"] = error csrf_tk["form"] = form csrf_tk["next_page"] = next_page @@ -884,3 +884,100 @@ def remove_oldtuto(request): u'au membre {0}'.format(profile.user.username)) return redirect(reverse("zds.member.views.details", args=[profile.user.username])) + + +@login_required +def settings_promote(request, user_pk): + """ Manage the admin right of user. Only super user can access """ + + if not request.user.is_superuser: + raise PermissionDenied + + profile = get_object_or_404(Profile, user__pk=user_pk) + user = profile.user + + if request.method == "POST": + form = PromoteMemberForm(request.POST) + data = dict(form.data.iterlists()) + + groups = Group.objects.all() + usergroups = user.groups.all() + + if 'groups' in data: + for group in groups: + if unicode(group.id) in data['groups']: + if group not in usergroups: + user.groups.add(group) + messages.success(request, u'{0} appartient maintenant au groupe {1}' + .format(user.username, group.name)) + else: + if group in usergroups: + user.groups.remove(group) + messages.warning(request, u'{0} n\'appartient maintenant plus au groupe {1}' + .format(user.username, group.name)) + topics_followed = Topic.objects.filter(topicfollowed__user=user, + forum__group=group) + for topic in topics_followed: + follow(topic, user) + else: + for group in usergroups: + topics_followed = Topic.objects.filter(topicfollowed__user=user, + forum__group=group) + for topic in topics_followed: + follow(topic, user) + user.groups.clear() + messages.warning(request, u'{0} n\'appartient (plus ?) à aucun groupe' + .format(user.username)) + + if 'superuser' in data and u'on' in data['superuser']: + if not user.is_superuser: + user.is_superuser = True + messages.success(request, u'{0} est maintenant super-utilisateur' + .format(user.username)) + else: + if user == request.user: + messages.error(request, u'Un super-utilisateur ne peux pas se retirer des super-utilisateur') + else: + if user.is_superuser: + user.is_superuser = False + messages.warning(request, u'{0} n\'est maintenant plus super-utilisateur' + .format(user.username)) + + user.save() + + usergroups = user.groups.all() + bot = get_object_or_404(User, username=settings.BOT_ACCOUNT) + msg = (u'Bonjour {0},\n\n' + u'Un administrateur vient de modifier les groupes ' + u'auxquels vous appartenez. \n'.format(user.username)) + if len(usergroups) > 0: + msg += u'Voici la liste des groupes dont vous faites dorénavant partis :\n\n' + for group in usergroups: + msg += u'* {0}\n'.format(group.name) + else: + msg += u'* Vous ne faites partis d\'aucun groupe' + msg += u'\n\n' + if user.is_superuser: + msg += (u'Vous avez aussi rejoint le rang des super utilisateurs. ' + u'N\'oubliez pas, un grand pouvoir entraine de grandes responsabiltiés !') + send_mp( + bot, + [user], + u'Modification des groupes', + u'', + msg, + True, + True, + ) + + return redirect(profile.get_absolute_url()) + + form = PromoteMemberForm(initial={'superuser': user.is_superuser, + 'groups': user.groups.all() + }) + + return render_template('member/settings/promote.html', { + "usr": user, + "profile": profile, + "form": form + }) diff --git a/zds/middlewares/profile.py b/zds/middlewares/profile.py new file mode 100644 index 0000000000..349dfd2bd4 --- /dev/null +++ b/zds/middlewares/profile.py @@ -0,0 +1,121 @@ +# Orignal version taken from http://www.djangosnippets.org/snippets/186/ +# Original author: udfalkso +# Modified by: Shwagroo Team and Gun.io + +import sys +import os +import re +import hotshot, hotshot.stats +import tempfile +import StringIO + +from django.conf import settings + +words_re = re.compile( r'\s+' ) + +group_prefix_re = [ + re.compile( "^.*/django/[^/]+" ), + re.compile( "^(.*)/[^/]+$" ), # extract module path + re.compile( ".*" ), # catch strange entries +] + + +def can_profile(request): + return (settings.DEBUG or (request.user is not None and request.user.is_superuser)) and 'prof' in request.GET + + +class ProfileMiddleware(object): + """ + Displays hotshot profiling for any view. + http://yoursite.com/yourview/?prof + + Add the "prof" key to query string by appending ?prof (or &prof=) + and you'll see the profiling results in your browser. + It's set up to only be available in django's debug mode, is available for superuser otherwise, + but you really shouldn't add this middleware to any production configuration. + + WARNING: It uses hotshot profiler which is not thread safe. + """ + + def process_request(self, request): + if can_profile(request): + self.tmpfile = tempfile.mktemp() + self.prof = hotshot.Profile(self.tmpfile) + + def process_view(self, request, callback, callback_args, callback_kwargs): + if can_profile(request): + return self.prof.runcall(callback, request, *callback_args, **callback_kwargs) + + def get_group(self, file): + for g in group_prefix_re: + name = g.findall( file ) + if name: + return name[0] + + def get_summary(self, results_dict, sum): + list = [ (item[1], item[0]) for item in results_dict.items() ] + list.sort( reverse = True ) + list = list[:40] + + res = " tottime\n" + for item in list: + res += "%4.1f%% %7.3f %s\n" % ( 100*item[0]/sum if sum else 0, item[0], item[1] ) + + return res + + def summary_for_files(self, stats_str): + stats_str = stats_str.split("\n")[5:] + + mystats = {} + mygroups = {} + + sum = 0 + + for s in stats_str: + fields = words_re.split(s); + if len(fields) == 7: + time = float(fields[2]) + sum += time + file = fields[6].split(":")[0] + + if not file in mystats: + mystats[file] = 0 + mystats[file] += time + + group = self.get_group(file) + if not group in mygroups: + mygroups[ group ] = 0 + mygroups[ group ] += time + + return "
    " + \
+               " ---- By file ----\n\n" + self.get_summary(mystats,sum) + "\n" + \
+               " ---- By group ---\n\n" + self.get_summary(mygroups,sum) + \
+               "
    " + + def process_response(self, request, response): + try: + if can_profile(request): + self.prof.close() + + out = StringIO.StringIO() + old_stdout = sys.stdout + sys.stdout = out + + stats = hotshot.stats.load(self.tmpfile) + stats.sort_stats('time', 'calls') + stats.print_stats() + + sys.stdout = old_stdout + stats_str = out.getvalue() + + if response and response.content and stats_str: + response.content = "
    " + stats_str + "
    " + + response.content = "\n".join(response.content.split("\n")[:40]) + + response.content += self.summary_for_files(stats_str) + + os.unlink(self.tmpfile) + except: + pass + return response diff --git a/zds/mp/forms.py b/zds/mp/forms.py index 8ddf661658..a6174579ff 100644 --- a/zds/mp/forms.py +++ b/zds/mp/forms.py @@ -47,11 +47,12 @@ class PrivateTopicForm(forms.Form): ) ) - def __init__(self, *args, **kwargs): + def __init__(self, username, *args, **kwargs): super(PrivateTopicForm, self).__init__(*args, **kwargs) self.helper = FormHelper() self.helper.form_class = 'content-wrapper' self.helper.form_method = 'post' + self.username = username self.helper.layout = Layout( Field('participants', autocomplete='off'), @@ -77,6 +78,9 @@ def clean(self): if User.objects.filter(username=receiver.strip()).count() == 0 and receiver.strip() != '': self._errors['participants'] = self.error_class( [u'Un des participants saisi est introuvable']) + elif receiver.strip() == self.username: + self._errors['participants'] = self.error_class( + [u'Vous ne pouvez pas vous écrire à vous-même !']) if title is not None and title.strip() == '': self._errors['title'] = self.error_class( diff --git a/zds/mp/tests.py b/zds/mp/tests.py index 7b5a718df2..5431fb9919 100644 --- a/zds/mp/tests.py +++ b/zds/mp/tests.py @@ -39,6 +39,25 @@ def test_mp_from_profile(self): # Check username in new MP page self.assertContains(result, user2.username) + def test_mp_multiple_users_from_link(self): + """Test: Send a MP to multiple users by link.""" + # Users to send the MP + user2 = ProfileFactory().user + user3 = ProfileFactory().user + + # Test if user is correctly added to the MP + result = self.client.get( + reverse('zds.mp.views.new') + + '?username={0}&username={1}'.format( + user2.username, + user3.username + ), + ) + + # Check username in new MP page + self.assertContains(result, user2.username) + self.assertContains(result, user3.username) + def test_view_mp(self): """check mp is readable.""" ptopic1 = PrivateTopicFactory(author=self.user1) diff --git a/zds/mp/views.py b/zds/mp/views.py index 88d83022f8..83f2376c9a 100644 --- a/zds/mp/views.py +++ b/zds/mp/views.py @@ -147,24 +147,25 @@ def new(request): if request.method == 'POST': # If the client is using the "preview" button if 'preview' in request.POST: - form = PrivateTopicForm(initial={ - 'participants': request.POST['participants'], - 'title': request.POST['title'], - 'subtitle': request.POST['subtitle'], - 'text': request.POST['text'], - }) + form = PrivateTopicForm(request.user.username, + initial={ + 'participants': request.POST['participants'], + 'title': request.POST['title'], + 'subtitle': request.POST['subtitle'], + 'text': request.POST['text'], + }) return render_template('mp/topic/new.html', { 'form': form, }) - form = PrivateTopicForm(request.POST) + form = PrivateTopicForm(request.user.username, request.POST) if form.is_valid(): data = form.data # Retrieve all participants of the MP. ctrl = [] - list_part = data['participants'].replace(',', ' ').split() + list_part = data['participants'].split(",") for part in list_part: part = part.strip() if part == '': @@ -190,19 +191,21 @@ def new(request): 'form': form, }) else: + dest = None if 'username' in request.GET: - try: - # check that username in url is in the database - dest = User.objects.get( - username=request.GET['username']).username - except: - dest = None - else: - dest = None - - form = PrivateTopicForm(initial={ - 'participants': dest - }) + destList = [] + # check that usernames in url is in the database + for username in request.GET.getlist('username'): + try: + destList.append(User.objects.get(username=username).username) + except: + pass + dest = ', '.join(destList) + + form = PrivateTopicForm(username=request.user.username, + initial={ + 'participants': dest, + }) return render_template('mp/topic/new.html', { 'form': form, }) diff --git a/zds/newsletter/admin.py b/zds/newsletter/admin.py deleted file mode 100644 index fb82baac60..0000000000 --- a/zds/newsletter/admin.py +++ /dev/null @@ -1,8 +0,0 @@ -# coding: utf-8 - -from django.contrib import admin - -from .models import Newsletter - - -admin.site.register(Newsletter) diff --git a/zds/newsletter/forms.py b/zds/newsletter/forms.py deleted file mode 100644 index 6fbcf1d273..0000000000 --- a/zds/newsletter/forms.py +++ /dev/null @@ -1,21 +0,0 @@ -# coding: utf-8 - -from django import forms - -from crispy_forms.helper import FormHelper -from crispy_forms.layout import Layout, Div, HTML - - -class NewsletterForm(forms.Form): - - def __init__(self, *args, **kwargs): - self.helper = FormHelper() - self.helper.form_method = 'post' - - self.helper.layout = Layout( - Div( - HTML(u''), - HTML(''), - )) - super(NewsletterForm, self).__init__(*args, **kwargs) diff --git a/zds/newsletter/migrations/0001_initial.py b/zds/newsletter/migrations/0001_initial.py deleted file mode 100644 index 634676e934..0000000000 --- a/zds/newsletter/migrations/0001_initial.py +++ /dev/null @@ -1,34 +0,0 @@ -# -*- coding: utf-8 -*- -from south.utils import datetime_utils as datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding model 'Newsletter' - db.create_table( - u'newsletter_newsletter', ((u'id', self.gf('django.db.models.fields.AutoField')( - primary_key=True)), ('email', self.gf('django.db.models.fields.CharField')( - max_length=80)), ('ip', self.gf('django.db.models.fields.CharField')( - max_length=20)), )) - db.send_create_signal(u'newsletter', ['Newsletter']) - - def backwards(self, orm): - # Deleting model 'Newsletter' - db.delete_table(u'newsletter_newsletter') - - models = { - u'newsletter.newsletter': { - 'Meta': { - 'object_name': 'Newsletter'}, 'email': ( - 'django.db.models.fields.CharField', [], { - 'max_length': '80'}), u'id': ( - 'django.db.models.fields.AutoField', [], { - 'primary_key': 'True'}), 'ip': ( - 'django.db.models.fields.CharField', [], { - 'max_length': '20'})}} - - complete_apps = ['newsletter'] diff --git a/zds/newsletter/migrations/0002_auto__chg_field_newsletter_ip.py b/zds/newsletter/migrations/0002_auto__chg_field_newsletter_ip.py deleted file mode 100644 index b5bff7faf5..0000000000 --- a/zds/newsletter/migrations/0002_auto__chg_field_newsletter_ip.py +++ /dev/null @@ -1,29 +0,0 @@ -# -*- coding: utf-8 -*- -from south.utils import datetime_utils as datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Changing field 'Newsletter.ip' - db.alter_column(u'newsletter_newsletter', 'ip', self.gf('django.db.models.fields.CharField')(max_length=39)) - - def backwards(self, orm): - - # Changing field 'Newsletter.ip' - db.alter_column(u'newsletter_newsletter', 'ip', self.gf('django.db.models.fields.CharField')(max_length=20)) - - models = { - u'newsletter.newsletter': { - 'Meta': {'object_name': 'Newsletter'}, - 'email': ('django.db.models.fields.CharField', [], {'max_length': '80'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'ip': ('django.db.models.fields.CharField', [], {'max_length': '39'}) - } - } - - complete_apps = ['newsletter'] \ No newline at end of file diff --git a/zds/newsletter/migrations/__init__.py b/zds/newsletter/migrations/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/zds/newsletter/models.py b/zds/newsletter/models.py deleted file mode 100644 index 598e4bcf24..0000000000 --- a/zds/newsletter/models.py +++ /dev/null @@ -1,18 +0,0 @@ -# coding: utf-8 - -from django.db import models - - -class Newsletter(models.Model): - - """Newsletter list.""" - class Meta: - verbose_name = 'Newsletter' - verbose_name_plural = 'Newsletter' - - email = models.CharField('email', max_length=80) - ip = models.CharField('ip_adress', max_length=39) - - def __unicode__(self): - """Textual Newsletter.""" - return self.email diff --git a/zds/newsletter/urls.py b/zds/newsletter/urls.py deleted file mode 100644 index e9c5459b2c..0000000000 --- a/zds/newsletter/urls.py +++ /dev/null @@ -1,8 +0,0 @@ -# coding: utf-8 - -from django.conf.urls import patterns, url - - -urlpatterns = patterns('', - url(r'^$', 'zds.newsletter.views.add_newsletter'), - ) diff --git a/zds/newsletter/views.py b/zds/newsletter/views.py deleted file mode 100644 index f3a6ddb979..0000000000 --- a/zds/newsletter/views.py +++ /dev/null @@ -1,33 +0,0 @@ -# coding: utf-8 - -from zds.member.views import get_client_ip -from zds.utils import render_template - -from .forms import NewsletterForm -from .models import Newsletter - - -def add_newsletter(request): - if request.method == 'POST': - form = NewsletterForm(request.POST) - my_ip = get_client_ip(request) - already = Newsletter.objects.filter(ip=my_ip).count() - - if form.is_valid() and already == 0: - data = form.data - print data['email'] - nl = Newsletter() - nl.email = data['email'] - nl.ip = my_ip - nl.save() - - return render_template('newsletter/confirm.html') - - else: - # TODO: add errors to the form and return it - return render_template('newsletter/failed.html') - else: - form = NewsletterForm() - return render_template('newsletter/index.html', { - 'form': form - }) diff --git a/zds/pages/views.py b/zds/pages/views.py index 14b0e961e8..4c920db3ef 100644 --- a/zds/pages/views.py +++ b/zds/pages/views.py @@ -29,7 +29,7 @@ def home(request): tutos = [] for tuto in get_last_tutorials(): data = tuto.load_json_for_public() - data = tuto.load_dic(data) + tuto.load_dic(data) tutos.append(data) articles = [] diff --git a/zds/settings.py b/zds/settings.py index b78ecd6cb2..fba44ab6a0 100644 --- a/zds/settings.py +++ b/zds/settings.py @@ -1,15 +1,6 @@ # coding: utf-8 -import locale import os -import platform - - -# Python is platform-independent...or is it? -if platform.system() == "Windows": - locale.setlocale(locale.LC_TIME, 'fra') -else: - locale.setlocale(locale.LC_TIME, 'fr_FR.UTF-8') DEBUG = True TEMPLATE_DEBUG = DEBUG @@ -51,7 +42,7 @@ # If you set this to False, Django will not format dates, numbers and # calendars according to the current locale. -USE_L10N = True +USE_L10N = False # If you set this to False, Django will not use timezone-aware datetimes. USE_TZ = False @@ -122,6 +113,7 @@ # 'django.middleware.clickjacking.XFrameOptionsMiddleware', 'zds.utils.ThreadLocals', 'zds.middlewares.SetLastVisitMiddleware.SetLastVisitMiddleware', + 'zds.middlewares.profile.ProfileMiddleware', ) ROOT_URLCONF = 'zds.urls' @@ -174,7 +166,6 @@ 'zds.pages', 'zds.gallery', 'zds.mp', - 'zds.newsletter', 'zds.article', 'zds.forum', 'zds.tutorial', @@ -309,6 +300,9 @@ # WITHOUT THE APPROVAL OF THE ASSOCIATION COMMITEE MAIL_NOREPLY = 'noreply@zestedesavoir.com' +# DEFAULT LICENCE : +DEFAULT_LICENCE_PK = 7 + # Load the production settings, overwrite the existing ones if needed try: from settings_prod import * diff --git a/zds/tutorial/factories.py b/zds/tutorial/factories.py index 5bbf344fa4..ab44cbd52b 100644 --- a/zds/tutorial/factories.py +++ b/zds/tutorial/factories.py @@ -17,10 +17,22 @@ from zds.tutorial.models import Tutorial, Part, Chapter, Extract, Note,\ Validation -from zds.utils.models import SubCategory +from zds.utils.models import SubCategory, Licence from zds.utils.tutorials import export_tutorial - +contenu = ( +u'Ceci est un contenu de tutoriel utile et à tester un peu partout' +u'Ce contenu ira aussi bien dans les introductions, que dans les conclusions et les extraits ' +u'le gros intéret étant qu\'il renferme des images pour tester l\'execution coté pandoc ' +u'Exemple d\'image ![Ma pepite souris](http://blog.science-infuse.fr/public/souris.jpg)' +u'\nExemple d\'image ![Image inexistante](http://blog.science-infuse.fr/public/inv_souris.jpg)' +u'\nExemple de gif ![](http://corigif.free.fr/oiseau/img/oiseau_004.gif)' +u'\nExemple de gif inexistant ![](http://corigif.free.fr/oiseau/img/ironman.gif)' +u'Une image de type wikipedia qui fait tomber des tests ![](https://s.qwant.com/thumbr/?u=http%3A%2F%2Fwww.blogoergosum.com%2Fwp-content%2Fuploads%2F2010%2F02%2Fwikipedia-logo.jpg&h=338&w=600)' +u'Image dont le serveur n\'existe pas ![](http://unknown.image.zds)' +u'\n Attention les tests ne doivent pas crasher ' +u'qu\'un sujet abandonné !') + class BigTutorialFactory(factory.DjangoModelFactory): FACTORY_FOR = Tutorial @@ -47,10 +59,10 @@ def _prepare(cls, create, **kwargs): f.write(json_writer.dumps(man, indent=4, ensure_ascii=False).encode('utf-8')) f.close() f = open(os.path.join(path, tuto.introduction), "w") - f.write(u'Test') + f.write(contenu.encode('utf-8')) f.close() f = open(os.path.join(path, tuto.conclusion), "w") - f.write(u'Test') + f.write(contenu.encode('utf-8')) f.close() repo.index.add(['manifest.json', tuto.introduction, tuto.conclusion]) cm = repo.index.commit("Init Tuto") @@ -90,10 +102,10 @@ def _prepare(cls, create, **kwargs): ensure_ascii=False).encode('utf-8')) file.close() file = open(os.path.join(path, tuto.introduction), "w") - file.write(u'Test') + file.write(contenu.encode('utf-8')) file.close() file = open(os.path.join(path, tuto.conclusion), "w") - file.write(u'Test') + file.write(contenu.encode('utf-8')) file.close() repo.index.add(['manifest.json', tuto.introduction, tuto.conclusion]) @@ -124,11 +136,11 @@ def _prepare(cls, create, **kwargs): part.save() f = open(os.path.join(tutorial.get_path(), part.introduction), "w") - f.write(u'Test') + f.write(contenu.encode('utf-8')) f.close() repo.index.add([part.introduction]) f = open(os.path.join(tutorial.get_path(), part.conclusion), "w") - f.write(u'Test') + f.write(contenu.encode('utf-8')) f.close() repo.index.add([part.conclusion]) @@ -202,14 +214,14 @@ def _prepare(cls, create, **kwargs): part.tutorial.get_path(), chapter.introduction), "w") - f.write(u'Test') + f.write(contenu.encode('utf-8')) f.close() f = open( os.path.join( part.tutorial.get_path(), chapter.conclusion), "w") - f.write(u'Test') + f.write(contenu.encode('utf-8')) f.close() part.tutorial.save() repo = Repo(part.tutorial.get_path()) @@ -290,3 +302,14 @@ class SubCategoryFactory(factory.DjangoModelFactory): class VaidationFactory(factory.DjangoModelFactory): FACTORY_FOR = Validation + +class LicenceFactory(factory.DjangoModelFactory): + FACTORY_FOR = Licence + + code = u'Licence bidon' + title = u'Licence bidon' + + @classmethod + def _prepare(cls, create, **kwargs): + licence = super(LicenceFactory, cls)._prepare(create, **kwargs) + return licence diff --git a/zds/tutorial/forms.py b/zds/tutorial/forms.py index add0efbae6..48b49e05a6 100644 --- a/zds/tutorial/forms.py +++ b/zds/tutorial/forms.py @@ -92,7 +92,8 @@ class TutorialForm(FormWithTitle): licence = forms.ModelChoiceField( label="Licence de votre publication", queryset=Licence.objects.all(), - required=False, + required=True, + empty_label=None ) def __init__(self, *args, **kwargs): @@ -408,7 +409,11 @@ class ValidForm(forms.Form): } ) ) - is_major = forms.BooleanField(label='Version majeure ?', required=False) + is_major = forms.BooleanField( + label='Version majeure ?', + required=False, + initial=True + ) source = forms.CharField( label='Source originale', required=False, diff --git a/zds/tutorial/models.py b/zds/tutorial/models.py index 31171594b8..742ff802f8 100644 --- a/zds/tutorial/models.py +++ b/zds/tutorial/models.py @@ -182,34 +182,73 @@ def get_prod_path(self): settings.REPO_PATH_PROD, str(self.pk) + '_' + slugify(data['title'])) - def load_dic(self, mandata): - mandata['get_absolute_url_online'] = reverse('zds.tutorial.views.view_tutorial_online', - args=[self.pk, slugify(mandata["title"])]) - mandata['get_absolute_url_beta'] = self.get_absolute_url_beta() - mandata['get_absolute_url'] = self.get_absolute_url() - mandata['get_introduction_online'] = self.get_introduction_online() - mandata['get_conclusion_online'] = self.get_conclusion_online() - + def load_dic(self, mandata, sha=None): + '''fill mandata with informations from database model''' + + fns = [ + 'is_big', 'is_mini', 'have_markdown','have_html', 'have_pdf', + 'have_epub', 'get_path', 'in_beta', 'in_validation', 'on_line' + ] + + attrs = [ + 'pk', 'authors', 'subcategory', 'image', 'pubdate', 'update', + 'source', 'sha_draft', 'sha_beta', 'sha_validation', 'sha_public' + ] + + #load functions and attributs in tree + for fn in fns: + mandata[fn] = getattr(self,fn) + for attr in attrs: + mandata[attr] = getattr(self,attr) + + # general information mandata['slug'] = slugify(mandata['title']) - mandata['pk'] = self.pk - mandata['on_line'] = self.on_line - mandata['authors'] = self.authors - mandata['subcategory'] = self.subcategory - mandata['image'] = self.image - mandata['pubdate'] = self.pubdate - mandata['source'] = self.source - mandata['have_markdown'] = self.have_markdown() - mandata['have_html'] = self.have_html() - mandata['have_pdf'] = self.have_pdf() - mandata['have_epub'] = self.have_epub() - - return mandata + mandata['is_beta'] = self.in_beta() and self.sha_beta == sha + mandata['is_validation'] = self.in_validation() \ + and self.sha_validation == sha + mandata['is_on_line'] = self.on_line() and self.sha_public == sha + + #url: + mandata['get_absolute_url'] = reverse( + 'zds.tutorial.views.view_tutorial', + args=[self.pk, mandata['slug']] + ) + + if self.in_beta(): + mandata['get_absolute_url_beta'] = reverse( + 'zds.tutorial.views.view_tutorial', + args=[self.pk, mandata['slug']] + ) + '?version=' + self.sha_beta + + else: + mandata['get_absolute_url_beta'] = reverse( + 'zds.tutorial.views.view_tutorial', + args=[self.pk, mandata['slug']] + ) + + mandata['get_absolute_url_online'] = reverse( + 'zds.tutorial.views.view_tutorial_online', + args=[self.pk, mandata['slug']] + ) + + def load_introduction_and_conclusion(self, mandata, sha=None, public=False): + '''Explicitly load introduction and conclusion to avoid useless disk + access in load_dic() + ''' + + if public: + mandata['get_introduction_online'] = self.get_introduction_online() + mandata['get_conclusion_online'] = self.get_conclusion_online() + else: + mandata['get_introduction'] = self.get_introduction(sha) + mandata['get_conclusion'] = self.get_conclusion(sha) + def load_json_for_public(self, sha=None): if sha is None: sha = self.sha_public repo = Repo(self.get_path()) - mantuto = get_blob(repo.commit(self.sha_public).tree, 'manifest.json') + mantuto = get_blob(repo.commit(sha).tree, 'manifest.json') data = json_reader.loads(mantuto) return data @@ -230,8 +269,6 @@ def load_json(self, path=None, online=False): json_data.close() return data - else: - return None def dump_json(self, path=None): if path is None: @@ -258,20 +295,19 @@ def get_introduction(self, sha=None): if path_tuto: return get_blob(repo.commit(sha).tree, path_tuto) - else: - return None def get_introduction_online(self): - intro = open( - os.path.join( - self.get_prod_path(), - self.introduction + - '.html'), - "r") - intro_contenu = intro.read() - intro.close() + if self.on_line(): + intro = open( + os.path.join( + self.get_prod_path(), + self.introduction + + '.html'), + "r") + intro_contenu = intro.read() + intro.close() - return intro_contenu.decode('utf-8') + return intro_contenu.decode('utf-8') def get_conclusion(self, sha=None): # find hash code @@ -286,20 +322,19 @@ def get_conclusion(self, sha=None): if path_tuto: return get_blob(repo.commit(sha).tree, path_tuto) - else: - return None def get_conclusion_online(self): - conclu = open( - os.path.join( - self.get_prod_path(), - self.conclusion + - '.html'), - "r") - conclu_contenu = conclu.read() - conclu.close() + if self.on_line(): + conclu = open( + os.path.join( + self.get_prod_path(), + self.conclusion + + '.html'), + "r") + conclu_contenu = conclu.read() + conclu.close() - return conclu_contenu.decode('utf-8') + return conclu_contenu.decode('utf-8') def save(self, *args, **kwargs): self.slug = slugify(self.title) @@ -976,8 +1011,9 @@ def get_text(self, sha=None): chapter = tutorial_version["chapter"] if "extracts" in chapter: for extract in chapter["extracts"]: - path_ext = extract["text"] - break + if extract["pk"] == self.pk: + path_ext = extract["text"] + break if path_ext: return get_blob(repo.commit(sha).tree, path_ext) diff --git a/zds/tutorial/search_indexes.py b/zds/tutorial/search_indexes.py index e6423e150e..15e8cf1afa 100644 --- a/zds/tutorial/search_indexes.py +++ b/zds/tutorial/search_indexes.py @@ -39,8 +39,9 @@ def index_queryset(self, using=None): class ChapterIndex(indexes.SearchIndex, indexes.Indexable): text = indexes.CharField(document=True, use_template=True) title = indexes.CharField(model_attr='title') - part = indexes.CharField(model_attr='part') - tutorial = indexes.CharField(model_attr='tutorial') + # A Chapter belongs to a Part (big-tuto) **or** a Tutorial (mini-tuto) + part = indexes.CharField(model_attr='part', null=True) + tutorial = indexes.CharField(model_attr='tutorial', null=True) def get_model(self): return Chapter diff --git a/zds/tutorial/tests.py b/zds/tutorial/tests.py index b54efefd4c..711173e98b 100644 --- a/zds/tutorial/tests.py +++ b/zds/tutorial/tests.py @@ -6,7 +6,7 @@ from django.conf import settings from django.core import mail from django.core.urlresolvers import reverse -from django.test import TestCase +from django.test import TestCase, RequestFactory from django.test.utils import override_settings from django.utils import html @@ -15,12 +15,11 @@ from zds.mp.models import PrivateTopic from zds.settings import SITE_ROOT from zds.tutorial.factories import BigTutorialFactory, MiniTutorialFactory, PartFactory, \ - ChapterFactory, NoteFactory, SubCategoryFactory + ChapterFactory, NoteFactory, SubCategoryFactory, LicenceFactory from zds.gallery.factories import GalleryFactory from zds.tutorial.models import Note, Tutorial, Validation, Extract, Part, Chapter from zds.utils.models import SubCategory, Licence, Alert from zds.utils.misc import compute_hash - @override_settings(MEDIA_ROOT=os.path.join(SITE_ROOT, 'media-test')) @override_settings(REPO_PATH=os.path.join(SITE_ROOT, 'tutoriels-private-test')) @override_settings( @@ -44,10 +43,14 @@ def setUp(self): self.user = ProfileFactory().user self.staff = StaffProfileFactory().user self.subcat = SubCategoryFactory() + + self.licence = LicenceFactory() + self.licence.save() self.bigtuto = BigTutorialFactory() self.bigtuto.authors.add(self.user_author) self.bigtuto.gallery = GalleryFactory() + self.bigtuto.licence = self.licence self.bigtuto.save() self.part1 = PartFactory(tutorial=self.bigtuto, position_in_tutorial=1) @@ -496,6 +499,7 @@ def test_workflow_tuto(self): 'introduction':"Bienvenue dans le monde binaires", 'conclusion': "", 'type': "BIG", + 'licence' : self.licence.pk, 'subcategory': self.subcat.pk, }, follow=False) @@ -1004,6 +1008,21 @@ def test_workflow_tuto(self): 'source': 'http://zestedesavoir.com', }, follow=False) + + # then active the beta on tutorial : + sha_draft = Tutorial.objects.get(pk=tuto.pk).sha_draft + response = self.client.post( + reverse('zds.tutorial.views.modify_tutorial'), + { + 'tutorial': tuto.pk, + 'activ_beta': True, + 'version': sha_draft + }, + follow=False + ) + self.assertEqual(302, response.status_code) + sha_beta = Tutorial.objects.get(pk=tuto.pk).sha_beta + self.assertEqual(sha_draft, sha_beta) #delete part 1 result = self.client.post( @@ -1023,6 +1042,81 @@ def test_workflow_tuto(self): follow=True) self.assertEqual(Chapter.objects.filter(part__tutorial=tuto.pk).count(), 2) self.assertEqual(Part.objects.filter(tutorial=tuto.pk).count(), 2) + + #check view delete part and chapter (draft version) + result = self.client.get( + reverse( + 'zds.tutorial.views.view_part', + args=[ + tuto.pk, + tuto.slug, + p1.pk, + p1.slug]), + follow=True) + self.assertEqual(result.status_code, 404) + + result = self.client.get( + reverse( + 'zds.tutorial.views.view_chapter', + args=[ + tuto.pk, + tuto.slug, + p2.pk, + p2.slug, + c3.pk, + c3.slug]), + follow=True) + self.assertEqual(result.status_code, 404) + + #deleted part and section HAVE TO be accessible on beta (get 200) + result = self.client.get( + reverse( + 'zds.tutorial.views.view_part', + args=[ + tuto.pk, + tuto.slug, + p1.pk, + p1.slug]) + '?version={}'.format(sha_beta), + follow=True) + self.assertEqual(result.status_code, 200) + + result = self.client.get( + reverse( + 'zds.tutorial.views.view_chapter', + args=[ + tuto.pk, + tuto.slug, + p2.pk, + p2.slug, + c3.pk, + c3.slug]) + '?version={}'.format(sha_beta), + follow=True) + self.assertEqual(result.status_code, 200) + + #deleted part and section HAVE TO be accessible online (get 200) + result = self.client.get( + reverse( + 'zds.tutorial.views.view_part_online', + args=[ + tuto.pk, + tuto.slug, + p1.pk, + p1.slug]), + follow=True) + self.assertEqual(result.status_code, 200) + + result = self.client.get( + reverse( + 'zds.tutorial.views.view_chapter_online', + args=[ + tuto.pk, + tuto.slug, + p2.pk, + p2.slug, + c3.pk, + c3.slug]), + follow=True) + self.assertEqual(result.status_code, 200) # ask public tutorial tuto = Tutorial.objects.get(pk=tuto.pk) @@ -1055,7 +1149,7 @@ def test_workflow_tuto(self): 'source': 'http://zestedesavoir.com', }, follow=False) - #check view online delete part and chapter + #check view delete part and chapter (draft version, get 404) result = self.client.get( reverse( 'zds.tutorial.views.view_part', @@ -1080,6 +1174,56 @@ def test_workflow_tuto(self): follow=True) self.assertEqual(result.status_code, 404) + #deleted part and section no longer accessible online (get 404) + result = self.client.get( + reverse( + 'zds.tutorial.views.view_part_online', + args=[ + tuto.pk, + tuto.slug, + p1.pk, + p1.slug]), + follow=True) + self.assertEqual(result.status_code, 404) + + result = self.client.get( + reverse( + 'zds.tutorial.views.view_chapter_online', + args=[ + tuto.pk, + tuto.slug, + p2.pk, + p2.slug, + c3.pk, + c3.slug]), + follow=True) + self.assertEqual(result.status_code, 404) + + #deleted part and section still accessible on beta (get 200) + result = self.client.get( + reverse( + 'zds.tutorial.views.view_part', + args=[ + tuto.pk, + tuto.slug, + p1.pk, + p1.slug]) + '?version={}'.format(sha_beta), + follow=True) + self.assertEqual(result.status_code, 200) + + result = self.client.get( + reverse( + 'zds.tutorial.views.view_chapter', + args=[ + tuto.pk, + tuto.slug, + p2.pk, + p2.slug, + c3.pk, + c3.slug]) + '?version={}'.format(sha_beta), + follow=True) + self.assertEqual(result.status_code, 200) + def test_conflict_does_not_destroy(self): """tests that simultaneous edition does not conflict""" sub = SubCategory() @@ -1104,6 +1248,7 @@ def test_conflict_does_not_destroy(self): 'subcategory': [sub.pk], 'introduction': self.bigtuto.get_introduction() +" un essai", 'conclusion': self.bigtuto.get_conclusion(), + 'licence' : self.bigtuto.licence.pk, 'last_hash': hash }, follow= True) conflict_result = self.client.post( @@ -1114,6 +1259,7 @@ def test_conflict_does_not_destroy(self): 'subcategory': [sub.pk], 'introduction': self.bigtuto.get_introduction() +" conflictual", 'conclusion': self.bigtuto.get_conclusion(), + 'licence' : self.bigtuto.licence.pk, 'last_hash': hash }, follow= False) self.assertEqual(conflict_result.status_code, 200) @@ -1548,12 +1694,32 @@ def test_workflow_beta_tuto(self) : # logout before self.client.logout() - # first, login with author : + + # check if acess to page with beta tutorial (with guest) + response = self.client.get( + reverse( + 'zds.tutorial.views.find_tuto', + args=[self.user_author.pk] + ) + '?type=beta' + ) + self.assertEqual(200, response.status_code) + + # then, login with author : self.assertEqual( self.client.login( username=self.user_author.username, password='hostel77'), True) + + # check if acess to page with beta tutorial (with author) + response = self.client.get( + reverse( + 'zds.tutorial.views.find_tuto', + args=[self.user_author.pk] + ) + '?type=beta' + ) + self.assertEqual(200, response.status_code) + # then active the beta on tutorial : sha_draft = Tutorial.objects.get(pk=self.bigtuto.pk).sha_draft response = self.client.post( @@ -1566,6 +1732,15 @@ def test_workflow_beta_tuto(self) : follow=False ) self.assertEqual(302, response.status_code) + + # check if acess to page with beta tutorial (with author) + response = self.client.get( + reverse( + 'zds.tutorial.views.find_tuto', + args=[self.user_author.pk] + ) + '?type=beta' + ) + self.assertEqual(200, response.status_code) # test beta : self.assertEqual( Tutorial.objects.get(pk=self.bigtuto.pk).sha_beta, @@ -1581,12 +1756,28 @@ def test_workflow_beta_tuto(self) : self.assertEqual( self.client.get(url).status_code, 302) - # test access for random user (get 200) + # check if acess to page with beta tutorial (with guest, get 200) + response = self.client.get( + reverse( + 'zds.tutorial.views.find_tuto', + args=[self.user_author.pk] + ) + '?type=beta' + ) + self.assertEqual(200, response.status_code) + # test tutorial acess for random user self.assertEqual( self.client.login( username=self.user.username, password='hostel77'), True) + # check if acess to page with beta tutorial (with random user, get 200) + response = self.client.get( + reverse( + 'zds.tutorial.views.find_tuto', + args=[self.user_author.pk] + ) + '?type=beta' + ) + # test access (get 200) self.assertEqual( self.client.get(url).status_code, 200) @@ -1725,6 +1916,7 @@ def test_gallery_tuto_change_name(self): 'introduction': self.bigtuto.introduction, 'description': self.bigtuto.description, 'conclusion': self.bigtuto.conclusion, + 'licence' : self.bigtuto.licence.pk, 'last_hash': compute_hash([os.path.join(self.bigtuto.get_path(),"introduction.md"), os.path.join(self.bigtuto.get_path(),"conclusion.md")]) }, @@ -1735,6 +1927,149 @@ def test_gallery_tuto_change_name(self): self.assertEqual(tuto.gallery.title, tuto.title) self.assertEqual(tuto.gallery.slug, tuto.slug) + def test_workflow_licence(self): + '''Ensure the behavior of licence on mini-tutorials''' + + # create a new licence + new_licence = LicenceFactory(code='CC_BY', title='Creative Commons BY') + new_licence = Licence.objects.get(pk=new_licence.pk) + + # check value first + tuto = Tutorial.objects.get(pk=self.bigtuto.pk) + self.assertEqual(tuto.licence.pk, self.licence.pk) + + # get value wich does not change (speed up test) + introduction = self.bigtuto.get_introduction() + conclusion = self.bigtuto.get_conclusion() + hash = compute_hash([ + os.path.join(self.bigtuto.get_path(),"introduction.md"), + os.path.join(self.bigtuto.get_path(),"conclusion.md") + ]) + + # logout before + self.client.logout() + # login with author + self.assertTrue( + self.client.login( + username=self.user_author.username, + password='hostel77') + ) + + # change licence (get 302) : + result = self.client.post( + reverse('zds.tutorial.views.edit_tutorial') + + '?tutoriel={}'.format(self.bigtuto.pk), + { + 'title': self.bigtuto.title, + 'description': self.bigtuto.description, + 'introduction': introduction, + 'conclusion': conclusion, + 'subcategory': self.subcat.pk, + 'licence' : new_licence.pk, + 'last_hash': hash + }, + follow=False) + self.assertEqual(result.status_code, 302) + + # test change : + tuto = Tutorial.objects.get(pk=self.bigtuto.pk) + self.assertNotEqual(tuto.licence.pk, self.licence.pk) + self.assertEqual(tuto.licence.pk, new_licence.pk) + + # test change in JSON : + json = tuto.load_json() + self.assertEquals(json['licence'], new_licence.code) + + # then logout ... + self.client.logout() + # ... and login with staff + self.assertTrue( + self.client.login( + username=self.staff.username, + password='hostel77') + ) + + # change licence back to old one (get 302, staff can change licence) : + result = self.client.post( + reverse('zds.tutorial.views.edit_tutorial') + + '?tutoriel={}'.format(self.bigtuto.pk), + { + 'title': self.bigtuto.title, + 'description': self.bigtuto.description, + 'introduction': introduction, + 'conclusion': conclusion, + 'subcategory': self.subcat.pk, + 'licence' : self.licence.pk, + 'last_hash': hash + }, + follow=False) + self.assertEqual(result.status_code, 302) + + # test change : + tuto = Tutorial.objects.get(pk=self.bigtuto.pk) + self.assertEqual(tuto.licence.pk, self.licence.pk) + self.assertNotEqual(tuto.licence.pk, new_licence.pk) + + # test change in JSON : + json = tuto.load_json() + self.assertEquals(json['licence'], self.licence.code) + + # then logout ... + self.client.logout() + + # change licence (get 302, redirection to login page) : + result = self.client.post( + reverse('zds.tutorial.views.edit_tutorial') + + '?tutoriel={}'.format(self.bigtuto.pk), + { + 'title': self.bigtuto.title, + 'description': self.bigtuto.description, + 'introduction': introduction, + 'conclusion': conclusion, + 'subcategory': self.subcat.pk, + 'licence' : new_licence.pk, + 'last_hash': hash + }, + follow=False) + self.assertEqual(result.status_code, 302) + + # test change (normaly, nothing has) : + tuto = Tutorial.objects.get(pk=self.bigtuto.pk) + self.assertEqual(tuto.licence.pk, self.licence.pk) + self.assertNotEqual(tuto.licence.pk, new_licence.pk) + + # login with random user + self.assertTrue( + self.client.login( + username=self.user.username, + password='hostel77') + ) + + # change licence (get 403, random user cannot edit bigtuto if not in + # authors list) : + result = self.client.post( + reverse('zds.tutorial.views.edit_tutorial') + + '?tutoriel={}'.format(self.bigtuto.pk), + { + 'title': self.bigtuto.title, + 'description': self.bigtuto.description, + 'introduction': introduction, + 'conclusion': conclusion, + 'subcategory': self.subcat.pk, + 'licence' : new_licence.pk, + 'last_hash': hash + }, + follow=False) + self.assertEqual(result.status_code, 403) + + # test change (normaly, nothing has) : + tuto = Tutorial.objects.get(pk=self.bigtuto.pk) + self.assertEqual(tuto.licence.pk, self.licence.pk) + self.assertNotEqual(tuto.licence.pk, new_licence.pk) + + # test change in JSON (normaly, nothing has) : + json = tuto.load_json() + self.assertEquals(json['licence'], self.licence.code) def tearDown(self): if os.path.isdir(settings.REPO_PATH): @@ -1771,10 +2106,14 @@ def setUp(self): self.staff = StaffProfileFactory().user self.subcat = SubCategoryFactory() + + self.licence = LicenceFactory() + self.licence.save() self.minituto = MiniTutorialFactory() self.minituto.authors.add(self.user_author) self.minituto.gallery = GalleryFactory() + self.minituto.licence = self.licence self.minituto.save() self.chapter = ChapterFactory( @@ -2418,6 +2757,7 @@ def test_edit_tuto(self): 'subcategory': [sub.pk], 'introduction': self.minituto.get_introduction(), 'conclusion': self.minituto.get_conclusion(), + 'licence' : self.minituto.licence.pk, 'last_hash': compute_hash([os.path.join(self.minituto.get_path(),"introduction.md"), os.path.join(self.minituto.get_path(),"conclusion.md")]) }, @@ -2437,6 +2777,7 @@ def test_edit_tuto(self): 'subcategory': [sub.pk], 'introduction': self.minituto.get_introduction(), 'conclusion': self.minituto.get_conclusion(), + 'licence' : self.minituto.licence.pk, 'last_hash': compute_hash([os.path.join(self.minituto.get_path(),"introduction.md"), os.path.join(self.minituto.get_path(),"conclusion.md")]) }, @@ -2498,6 +2839,16 @@ def test_workflow_beta_tuto(self) : # logout before self.client.logout() + + # check if acess to page with beta tutorial (with guest) + response = self.client.get( + reverse( + 'zds.tutorial.views.find_tuto', + args=[self.user_author.pk] + ) + '?type=beta' + ) + self.assertEqual(200, response.status_code) + # first, login with author : self.assertEqual( self.client.login( @@ -2516,6 +2867,15 @@ def test_workflow_beta_tuto(self) : follow=False ) self.assertEqual(302, response.status_code) + + # check if acess to page with beta tutorial (with author) + response = self.client.get( + reverse( + 'zds.tutorial.views.find_tuto', + args=[self.user_author.pk] + ) + '?type=beta' + ) + self.assertEqual(200, response.status_code) # test beta : self.assertEqual( Tutorial.objects.get(pk=self.minituto.pk).sha_beta, @@ -2540,6 +2900,15 @@ def test_workflow_beta_tuto(self) : self.assertEqual( self.client.get(url).status_code, 200) + + # check if acess to page with beta tutorial (with random user) + response = self.client.get( + reverse( + 'zds.tutorial.views.find_tuto', + args=[self.user_author.pk] + ) + '?type=beta' + ) + self.assertEqual(200, response.status_code) # then modify tutorial self.assertEqual( @@ -2680,6 +3049,7 @@ def test_workflow_tuto(self): 'introduction':"Bienvenue dans le monde binaires", 'conclusion': "", 'type': "MINI", + 'licence' : self.licence.pk, 'subcategory': self.subcat.pk, }, follow=False) @@ -2792,6 +3162,150 @@ def test_workflow_tuto(self): self.assertEqual(Extract.objects.filter(chapter__tutorial=tuto).count(), 2) + def test_workflow_licence(self): + '''Ensure the behavior of licence on mini-tutorials''' + + # create a new licence + new_licence = LicenceFactory(code='CC_BY', title='Creative Commons BY') + new_licence = Licence.objects.get(pk=new_licence.pk) + + # check value first + tuto = Tutorial.objects.get(pk=self.minituto.pk) + self.assertEqual(tuto.licence.pk, self.licence.pk) + + # get value wich does not change (speed up test) + introduction = self.minituto.get_introduction() + conclusion = self.minituto.get_conclusion() + hash = compute_hash([ + os.path.join(self.minituto.get_path(),"introduction.md"), + os.path.join(self.minituto.get_path(),"conclusion.md") + ]) + + # logout before + self.client.logout() + # login with author + self.assertTrue( + self.client.login( + username=self.user_author.username, + password='hostel77') + ) + + # change licence (get 302) : + result = self.client.post( + reverse('zds.tutorial.views.edit_tutorial') + + '?tutoriel={}'.format(self.minituto.pk), + { + 'title': self.minituto.title, + 'description': self.minituto.description, + 'introduction': introduction, + 'conclusion': conclusion, + 'subcategory': self.subcat.pk, + 'licence' : new_licence.pk, + 'last_hash': hash + }, + follow=False) + self.assertEqual(result.status_code, 302) + + # test change : + tuto = Tutorial.objects.get(pk=self.minituto.pk) + self.assertNotEqual(tuto.licence.pk, self.licence.pk) + self.assertEqual(tuto.licence.pk, new_licence.pk) + + # test change in JSON : + json = tuto.load_json() + self.assertEquals(json['licence'], new_licence.code) + + # then logout ... + self.client.logout() + # ... and login with staff + self.assertTrue( + self.client.login( + username=self.staff.username, + password='hostel77') + ) + + # change licence back to old one (get 302, staff can change licence) : + result = self.client.post( + reverse('zds.tutorial.views.edit_tutorial') + + '?tutoriel={}'.format(self.minituto.pk), + { + 'title': self.minituto.title, + 'description': self.minituto.description, + 'introduction': introduction, + 'conclusion': conclusion, + 'subcategory': self.subcat.pk, + 'licence' : self.licence.pk, + 'last_hash': hash + }, + follow=False) + self.assertEqual(result.status_code, 302) + + # test change : + tuto = Tutorial.objects.get(pk=self.minituto.pk) + self.assertEqual(tuto.licence.pk, self.licence.pk) + self.assertNotEqual(tuto.licence.pk, new_licence.pk) + + # test change in JSON : + json = tuto.load_json() + self.assertEquals(json['licence'], self.licence.code) + + # then logout ... + self.client.logout() + + # change licence (get 302, redirection to login page) : + result = self.client.post( + reverse('zds.tutorial.views.edit_tutorial') + + '?tutoriel={}'.format(self.minituto.pk), + { + 'title': self.minituto.title, + 'description': self.minituto.description, + 'introduction': introduction, + 'conclusion': conclusion, + 'subcategory': self.subcat.pk, + 'licence' : new_licence.pk, + 'last_hash': hash + }, + follow=False) + self.assertEqual(result.status_code, 302) + + # test change (normaly, nothing has) : + tuto = Tutorial.objects.get(pk=self.minituto.pk) + self.assertEqual(tuto.licence.pk, self.licence.pk) + self.assertNotEqual(tuto.licence.pk, new_licence.pk) + + # login with random user + self.assertTrue( + self.client.login( + username=self.user.username, + password='hostel77') + ) + + # change licence (get 403, random user cannot edit minituto if not in + # authors list) : + result = self.client.post( + reverse('zds.tutorial.views.edit_tutorial') + + '?tutoriel={}'.format(self.minituto.pk), + { + 'title': self.minituto.title, + 'description': self.minituto.description, + 'introduction': introduction, + 'conclusion': conclusion, + 'subcategory': self.subcat.pk, + 'licence' : new_licence.pk, + 'last_hash': hash + }, + follow=False) + self.assertEqual(result.status_code, 403) + + # test change (normaly, nothing has) : + tuto = Tutorial.objects.get(pk=self.minituto.pk) + self.assertEqual(tuto.licence.pk, self.licence.pk) + self.assertNotEqual(tuto.licence.pk, new_licence.pk) + + # test change in JSON (normaly, nothing has) : + json = tuto.load_json() + self.assertEquals(json['licence'], self.licence.code) + def tearDown(self): if os.path.isdir(settings.REPO_PATH): shutil.rmtree(settings.REPO_PATH) diff --git a/zds/tutorial/views.py b/zds/tutorial/views.py index 8070d47e6b..fc0b25f03d 100644 --- a/zds/tutorial/views.py +++ b/zds/tutorial/views.py @@ -4,7 +4,7 @@ from datetime import datetime from operator import attrgetter from urllib import urlretrieve -from urlparse import urlparse +from urlparse import urlparse, parse_qs try: import ujson as json_reader except: @@ -93,7 +93,7 @@ def index(request): tuto_versions = [] for tutorial in tutorials: mandata = tutorial.load_json_for_public() - mandata = tutorial.load_dic(mandata) + tutorial.load_dic(mandata) tuto_versions.append(mandata) return render_template("tutorial/index.html", {"tutorials": tuto_versions, "tag": tag}) @@ -189,7 +189,10 @@ def reservation(request, validation_pk): messages.info(request, u"Le tutoriel a bien été \ réservé par {0}.".format(request.user.username)) - return redirect(validation.tutorial.get_absolute_url()) + return redirect( + validation.tutorial.get_absolute_url() + + "?version=" + validation.version + ) @@ -298,9 +301,9 @@ def reject_tutorial(request): msg = ( u'Désolé **{0}**, ton zeste **{1}** n\'a malheureusement ' u'pas passé l’étape de validation. Mais ne désespère pas, ' - u'certaines corrections peuvent surement être faite pour ' + u'certaines corrections peuvent sûrement être faites pour ' u'l’améliorer et repasser la validation plus tard. ' - u'Voici le message que [{2}]({3}), ton validateur t\'a laissé `{4}`' + u'Voici le message que [{2}]({3}), ton validateur t\'a laissé\n\n> {4}\n\n' u'N\'hésite pas à lui envoyer un petit message pour discuter ' u'de la décision ou demander plus de détails si tout cela te ' u'semble injuste ou manque de clarté.'.format( @@ -598,16 +601,16 @@ def modify_tutorial(request): .format(author.username)) return redirect(redirect_url) elif "activ_beta" in request.POST: - if "version" in request.POST and tutorial.sha_draft == request.POST['version'] : - tutorial.sha_beta = tutorial.sha_draft + if "version" in request.POST: + tutorial.sha_beta = request.POST['version'] tutorial.save() messages.success(request, u"La BETA sur ce tutoriel est bien activée.") else: messages.error(request, u"Impossible d'activer la BETA sur ce tutoriel.") return redirect(tutorial.get_absolute_url_beta()) elif "update_beta" in request.POST: - if "version" in request.POST and tutorial.sha_draft == request.POST['version'] : - tutorial.sha_beta = tutorial.sha_draft + if "version" in request.POST: + tutorial.sha_beta = request.POST['version'] tutorial.save() messages.success(request, u"La BETA sur ce tutoriel a bien été mise à jour.") else: @@ -663,14 +666,19 @@ def view_tutorial(request, tutorial_pk, tutorial_slug): manifest = get_blob(repo.commit(sha).tree, "manifest.json") mandata = json_reader.loads(manifest) + tutorial.load_dic(mandata, sha) + tutorial.load_introduction_and_conclusion(mandata, sha) + + #print mandata # If it's a small tutorial, fetch its chapter if tutorial.type == "MINI": - if "chapter" in mandata: + if 'chapter' in mandata: chapter = mandata["chapter"] chapter["path"] = tutorial.get_path() chapter["type"] = "MINI" + chapter["pk"] = Chapter.objects.get(tutorial=tutorial).pk chapter["intro"] = get_blob(repo.commit(sha).tree, "introduction.md") chapter["conclu"] = get_blob(repo.commit(sha).tree, "conclusion.md" @@ -711,8 +719,7 @@ def view_tutorial(request, tutorial_pk, tutorial_slug): cpt_e += 1 cpt_c += 1 cpt_p += 1 - validation = Validation.objects.filter(tutorial__pk=tutorial.pk, - version=sha)\ + validation = Validation.objects.filter(tutorial__pk=tutorial.pk)\ .order_by("-date_proposition")\ .first() formAskValidation = AskValidationForm() @@ -722,7 +729,7 @@ def view_tutorial(request, tutorial_pk, tutorial_slug): formValid = ValidForm() formReject = RejectForm() return render_template("tutorial/tutorial/view.html", { - "tutorial": tutorial, + "tutorial": mandata, "chapter": chapter, "parts": parts, "version": sha, @@ -751,7 +758,8 @@ def view_tutorial_online(request, tutorial_pk, tutorial_slug): # find the good manifest file mandata = tutorial.load_json_for_public() - mandata = tutorial.load_dic(mandata) + tutorial.load_dic(mandata, sha=tutorial.sha_public) + tutorial.load_introduction_and_conclusion(mandata, public=True) mandata["update"] = tutorial.update mandata["get_note_count"] = tutorial.get_note_count() @@ -894,6 +902,10 @@ def add_tutorial(request): if "licence" in data and data["licence"] != "": lc = Licence.objects.filter(pk=data["licence"]).all()[0] tutorial.licence = lc + else: + tutorial.licence = Licence.objects.get( + pk=settings.DEFAULT_LICENCE_PK + ) # add create date @@ -957,7 +969,11 @@ def add_tutorial(request): ) return redirect(tutorial.get_absolute_url()) else: - form = TutorialForm() + form = TutorialForm( + initial={ + 'licence' : Licence.objects.get(pk=settings.DEFAULT_LICENCE_PK) + } + ) return render_template("tutorial/tutorial/new.html", {"form": form}) @@ -1009,6 +1025,10 @@ def edit_tutorial(request): if "licence" in data and data["licence"] != "": lc = Licence.objects.filter(pk=data["licence"]).all()[0] tutorial.licence = lc + else: + tutorial.licence = Licence.objects.get( + pk=settings.DEFAULT_LICENCE_PK + ) # add MAJ date @@ -1056,7 +1076,9 @@ def edit_tutorial(request): if "licence" in json: licence = Licence.objects.filter(code=json["licence"]).all()[0] else: - licence = None + licence = Licence.objects.get( + pk=settings.DEFAULT_LICENCE_PK + ) form = TutorialForm(initial={ "title": json["title"], "type": json["type"], @@ -1104,6 +1126,8 @@ def view_part( repo = Repo(tutorial.get_path()) manifest = get_blob(repo.commit(sha).tree, "manifest.json") mandata = json_reader.loads(manifest) + tutorial.load_dic(mandata, sha=sha) + parts = mandata["parts"] find = False cpt_p = 1 @@ -1142,7 +1166,7 @@ def view_part( raise Http404 return render_template("tutorial/part/view.html", - {"tutorial": tutorial, + {"tutorial": mandata, "part": final_part, "version": sha}) @@ -1164,7 +1188,7 @@ def view_part_online( # find the good manifest file mandata = tutorial.load_json_for_public() - mandata = tutorial.load_dic(mandata) + tutorial.load_dic(mandata, sha=tutorial.sha_public) mandata["update"] = tutorial.update mandata["get_parts"] = mandata["parts"] @@ -1412,10 +1436,7 @@ def view_chapter( ): """View chapter.""" - chapter = get_object_or_404(Chapter, pk=chapter_pk, - part__pk=part_pk, - part__tutorial__pk=tutorial_pk) - tutorial = chapter.get_tutorial() + tutorial = get_object_or_404(Tutorial, pk=tutorial_pk) try: sha = request.GET["version"] @@ -1435,6 +1456,8 @@ def view_chapter( repo = Repo(tutorial.get_path()) manifest = get_blob(repo.commit(sha).tree, "manifest.json") mandata = json_reader.loads(manifest) + tutorial.load_dic(mandata, sha=sha) + parts = mandata["parts"] cpt_p = 1 final_chapter = None @@ -1449,7 +1472,7 @@ def view_chapter( args=[ tutorial.pk, tutorial.slug, - part_pk, + part["pk"], part["slug"]]) part["tutorial"] = tutorial for chapter in part["chapters"]: @@ -1492,7 +1515,7 @@ def view_chapter( < len(chapter_tab) else None) return render_template("tutorial/chapter/view.html", { - "tutorial": tutorial, + "tutorial": mandata, "chapter": final_chapter, "prev": prev_chapter, "next": next_chapter, @@ -1519,7 +1542,7 @@ def view_chapter_online( # find the good manifest file mandata = tutorial.load_json_for_public() - mandata = tutorial.load_dic(mandata) + tutorial.load_dic(mandata, sha=tutorial.sha_public) mandata["update"] = tutorial.update mandata['get_parts'] = mandata["parts"] @@ -1538,7 +1561,7 @@ def view_chapter_online( args=[ tutorial.pk, tutorial.slug, - part_pk, + part["pk"], part["slug"]]) part["tutorial"] = mandata part["position_in_tutorial"] = cpt_p @@ -1929,26 +1952,30 @@ def edit_extract(request): if request.method == "POST": data = request.POST - if content_has_changed([extract.get_path()], data["last_hash"]): - form = form = ExtractForm(initial={ - "title": extract.title, - "text": extract.get_text()}) - return render_template("tutorial/extract/edit.html", - { - "extract": extract, - "last_hash": compute_hash([extract.get_path()]), - "new_version":True, - "form": form - }) # Using the « preview button » if "preview" in data: - form = ExtractForm(initial={"title": data["title"], - "text": data["text"]}) + form = ExtractForm(initial={ + "title": data["title"], + "text": data["text"] + }) return render_template("tutorial/extract/edit.html", - {"extract": extract, "form": form}) + { + "extract": extract, "form": form, + "last_hash": compute_hash([extract.get_path()]) + }) else: - + if content_has_changed([extract.get_path()], data["last_hash"]): + form = ExtractForm(initial={ + "title": extract.title, + "text": extract.get_text()}) + return render_template("tutorial/extract/edit.html", + { + "extract": extract, + "last_hash": compute_hash([extract.get_path()]), + "new_version":True, + "form": form + }) # Edit extract. form = ExtractForm(request.POST) @@ -2094,7 +2121,7 @@ def find_tuto(request, pk_user): tuto_versions = [] for tutorial in tutorials: mandata = tutorial.load_json_for_public(sha=tutorial.sha_beta) - mandata = tutorial.load_dic(mandata) + tutorial.load_dic(mandata, sha=tutorial.sha_beta) tuto_versions.append(mandata) return render_template("tutorial/member/beta.html", @@ -2107,7 +2134,7 @@ def find_tuto(request, pk_user): tuto_versions = [] for tutorial in tutorials: mandata = tutorial.load_json_for_public() - mandata = tutorial.load_dic(mandata) + tutorial.load_dic(mandata) tuto_versions.append(mandata) return render_template("tutorial/member/online.html", {"tutorials": tuto_versions, @@ -2771,20 +2798,23 @@ def get_url_images(md_text, pt): """find images urls in markdown text and download this.""" regex = ur"(!\[.*?\]\()(.+?)(\))" + unknow_path = os.path.join(settings.SITE_ROOT, "fixtures", "noir_black.png") # if text is empty don't download if md_text is not None: imgs = re.findall(regex, md_text) for img in imgs: - - # decompose images - - parse_object = urlparse(img[1]) + real_url=img[1] + # decompose images + parse_object = urlparse(real_url) + if parse_object.query!='': + resp = parse_qs(urlparse(img[1]).query, keep_blank_values=True) + real_url = resp["u"][0] + parse_object = urlparse(real_url) # if link is http type - - if parse_object.scheme in ("http", "https", "ftp") or \ + if parse_object.scheme in ["http", "https", "ftp"] or \ parse_object.netloc[:3]=="www" or \ parse_object.path[:3]=="www": (filepath, filename) = os.path.split(parse_object.path) @@ -2792,62 +2822,81 @@ def get_url_images(md_text, pt): os.makedirs(os.path.join(pt, "images")) # download image - - urlretrieve(img[1], os.path.abspath(os.path.join(pt, "images", - filename))) - ext = filename.split(".")[-1] - - # if image is gif, convert to png - - if ext == "gif": - im = ImagePIL.open(os.path.join(pt, img[1])) - im.save(os.path.join(pt, filename.split(".")[0] + ".png")) + down_path=os.path.abspath(os.path.join(pt, "images", filename)) + try: + urlretrieve(real_url, down_path) + try: + ext = filename.split(".")[-1] + im = ImagePIL.open(down_path) + # if image is gif, convert to png + if ext == "gif": + im.save(os.path.join(pt, "images", filename.split(".")[0] + ".png")) + except IOError: + ext = filename.split(".")[-1] + im = ImagePIL.open(unknow_path) + if ext == "gif": + im.save(os.path.join(pt, "images", filename.split(".")[0] + ".png")) + else: + im.save(os.path.join(pt, "images", filename)) + except IOError: + pass else: - # relative link - - srcfile = settings.SITE_ROOT + img[1] + srcfile = settings.SITE_ROOT + real_url if os.path.isfile(srcfile): - dstroot = pt + img[1] + dstroot = pt + real_url dstdir = os.path.dirname(dstroot) if not os.path.exists(dstdir): os.makedirs(dstdir) shutil.copy(srcfile, dstroot) - ext = dstroot.split(".")[-1] - - # if image is gif, convert to png - - if ext == "gif": + try: + ext = dstroot.split(".")[-1] im = ImagePIL.open(dstroot) - im.save(os.path.join(dstroot.split(".")[0] + ".png")) + # if image is gif, convert to png + if ext == "gif": + im.save(os.path.join(dstroot.split(".")[0] + ".png")) + except IOError: + ext = dstroot.split(".")[-1] + im = ImagePIL.open(unknow_path) + if ext == "gif": + im.save(os.path.join(dstroot.split(".")[0] + ".png")) + else: + im.save(os.path.join(dstroot)) def sub_urlimg(g): start = g.group("start") url = g.group("url") parse_object = urlparse(url) + if parse_object.query!='': + resp = parse_qs(urlparse(url).query, keep_blank_values=True) + parse_object = urlparse(resp["u"][0]) (filepath, filename) = os.path.split(parse_object.path) - ext = filename.split(".")[-1] - if ext == "gif": - if parse_object.scheme in ("http", "https") or \ - parse_object.netloc[:3]=="www" or \ - parse_object.path[:3]=="www": - url = os.path.join("images", filename.split(".")[0] + ".png") + if filename!='': + mark= g.group("mark") + ext = filename.split(".")[-1] + if ext == "gif": + if parse_object.scheme in ("http", "https") or \ + parse_object.netloc[:3]=="www" or \ + parse_object.path[:3]=="www": + url = os.path.join("images", filename.split(".")[0] + ".png") + else: + url = (url.split(".")[0])[1:] + ".png" else: - url = (url.split(".")[0])[1:] + ".png" + if parse_object.scheme in ("http", "https") or \ + parse_object.netloc[:3]=="www" or \ + parse_object.path[:3]=="www": + url = os.path.join("images", filename) + else: + url = url[1:] + end = g.group("end") + return start + mark+ url + end else: - if parse_object.scheme in ("http", "https") or \ - parse_object.netloc[:3]=="www" or \ - parse_object.path[:3]=="www": - url = os.path.join("images", filename) - else: - url = url[1:] - end = g.group("end") - return start + url + end - + return start + def markdown_to_out(md_text): - return re.sub(ur"(?P!\[.*?\]\()(?P.+?)(?P\))", sub_urlimg, + return re.sub(ur"(?P)(?P!\[.*?\]\()(?P.+?)(?P\))", sub_urlimg, md_text) @@ -3084,7 +3133,7 @@ def solve_alert(request): u'Vous recevez ce message car vous avez signalé le message de *{1}*, ' u'dans le tutoriel [{2}]({3}). Votre alerte a été traitée par **{4}** ' u'et il vous a laissé le message suivant :' - u'\n\n`{5}`\n\nToute l\'équipe de la modération vous remercie'.format( + u'\n\n> {5}\n\nToute l\'équipe de la modération vous remercie !'.format( alert.author.username, note.author.username, note.tutorial.title, diff --git a/zds/urls.py b/zds/urls.py index 0ac94d40b9..950527980a 100644 --- a/zds/urls.py +++ b/zds/urls.py @@ -79,7 +79,6 @@ def location(self, article): url(r'^admin/', include(admin.site.urls)), url(r'^pages/', include('zds.pages.urls')), url(r'^galerie/', include('zds.gallery.urls')), - url(r'^teasing/', include('zds.newsletter.urls')), url(r'^rechercher/', include('zds.search.urls')), url(r'^munin/', include('zds.munin.urls')), diff --git a/zds/utils/templatetags/append_to_get.py b/zds/utils/templatetags/append_to_get.py index 9ebbe98476..217ff11353 100644 --- a/zds/utils/templatetags/append_to_get.py +++ b/zds/utils/templatetags/append_to_get.py @@ -8,7 +8,6 @@ def easy_tag(func): """deal with the repetitive parts of parsing template tags""" def inner(parser, token): - #print token try: return func(*token.split_contents()) except TypeError: @@ -28,17 +27,16 @@ def __init__(self, dict): def render(self, context): get = context['request'].GET.copy() + path = context['request'].META['PATH_INFO'] for key in self.dict_pairs: get[key] = self.dict_pairs[key].resolve(context) - path = context['request'].META['PATH_INFO'] - - #print "&".join(["%s=%s" % (key, value) for (key, value) in get.items() if value]) - if len(get): - path += "?%s" % "&".join(["%s=%s" % (key, str(value)) for (key, value) in get.items() if str(value)]) - + path += "?" + for (key, v) in get.items(): + for value in get.getlist(key): + path += u"&{0}={1}".format(key, value) return path diff --git a/zds/utils/templatetags/emarkdown.py b/zds/utils/templatetags/emarkdown.py index 42b735771b..5f09b88af8 100644 --- a/zds/utils/templatetags/emarkdown.py +++ b/zds/utils/templatetags/emarkdown.py @@ -17,6 +17,7 @@ def get_markdown_instance(Inline=False): # Generate parser md = markdown.Markdown(extensions=(zdsext,), safe_mode = 'escape', + inline = Inline, # Protect use of html by escape it enable_attributes = False, # Disable the conversion of attributes. diff --git a/zds/utils/templatetags/interventions.py b/zds/utils/templatetags/interventions.py index f81793b397..654ddaccc1 100644 --- a/zds/utils/templatetags/interventions.py +++ b/zds/utils/templatetags/interventions.py @@ -107,6 +107,8 @@ def interventions_topics(user): for top in topics_never_read: content = top.topic.first_unread_post() + if content is None: + content = top.topic.last_message posts_unread.append({'pubdate':content.pubdate, 'author':content.author, 'title':top.topic.title, 'url':content.get_absolute_url()}) posts_unread.sort(cmp = comp) diff --git a/zds/utils/templatetags/topbar.py b/zds/utils/templatetags/topbar.py index 79f89a9587..fb8e479b2e 100644 --- a/zds/utils/templatetags/topbar.py +++ b/zds/utils/templatetags/topbar.py @@ -54,3 +54,9 @@ def top_categories_tuto(user): else: cats[key] = [csc.subcategory] return cats + + +@register.filter('auth_forum') +def auth_forum(forum, user): + return forum.can_read(user) +