Merge branch 'dev' into passez_votre_chemin_refacto_urls_en_cours_3

zestedesavoir · Jul 3, 2022 · d8adc10 · d8adc10
2 parents d959e85 + 0b4c280
commit d8adc10
Show file tree

Hide file tree

Showing 30 changed files with 229 additions and 168 deletions.
diff --git a/fixtures/advanced/aide_tuto_media.yaml b/fixtures/advanced/aide_tuto_media.yaml
@@ -1,25 +1,25 @@
--   factory: zds.utils.tests.factories.HelpWritingFactory
+-   factory: zds.tutorialv2.tests.factories.HelpWritingFactory
     fields:
         title: "Rédacteur"
         tablelabel: "Besoin d'aide pour la rédaction"
         slug: "redacteur"
         fixture_image_path: "aide_redacteur.png"
 
--   factory: zds.utils.tests.factories.HelpWritingFactory
+-   factory: zds.tutorialv2.tests.factories.HelpWritingFactory
     fields:
         title: "Correcteur"
         tablelabel: "Besoin d'aide pour la correction"
         slug: "correcteur"
         fixture_image_path: "aide_correcteur.png"
 
--   factory: zds.utils.tests.factories.HelpWritingFactory
+-   factory: zds.tutorialv2.tests.factories.HelpWritingFactory
     fields:
         title: "Illustrateur"
         tablelabel: "Besoin d'aide pour l'illustration"
         slug: "illustrateur"
         fixture_image_path: "aide_illustrateur.png"
 
--   factory: zds.utils.tests.factories.HelpWritingFactory
+-   factory: zds.tutorialv2.tests.factories.HelpWritingFactory
     fields:
         title: "Repreneur"
         tablelabel: "Cherche un repreneur"

diff --git a/templates/featured/base.html b/templates/featured/base.html
@@ -15,20 +15,20 @@
 
 
 {% block breadcrumb_base %}
-    <li><a href="{% url 'featured-resource-list' %}">{% trans "Mise en avant du site" %}</a></li>
+    <li><a href="{% url "featured:resource-list" %}">{% trans "Mise en avant du site" %}</a></li>
 {% endblock %}
 
 
 
 {% block sidebar %}
     <aside class="sidebar accordeon mobile-menu-bloc" data-title="{% trans 'Action sur les unes' %}">
-        <a href="{% url 'featured-message-create' %}" class="new-btn ico-after more blue">
+        <a href="{% url "featured:message-create" %}" class="new-btn ico-after more blue">
             {% trans "Éditer le message d’accueil" %}
         </a>
-        <a href="{% url 'featured-resource-create' %}" class="new-btn ico-after more blue">
+        <a href="{% url "featured:resource-create" %}" class="new-btn ico-after more blue">
             {% trans "Nouvelle une" %}
         </a>
-        <a href="{% url 'featured-resource-requests' %}" class="new-btn ico-after star blue">
+        <a href="{% url "featured:resource-requests" %}" class="new-btn ico-after star blue">
             {% trans "Liste des requêtes pour les unes" %}
         </a>
 

diff --git a/templates/featured/index.html b/templates/featured/index.html
@@ -43,7 +43,7 @@
                         <input name="items" type="checkbox" value="{{ featured_resource.pk }}" form="form-delete-featured">
                     </div>
                     <div class="topic-description">
-                        <a href="{% url 'featured-resource-update' featured_resource.pk %}" class="topic-title-link navigable-link">
+                        <a href="{% url "featured:resource-update" featured_resource.pk %}" class="topic-title-link navigable-link">
                             <img src="{{ featured_resource.image_url|remove_url_scheme }}"
                                  data-caption="{{ featured_resource.title }}"
                                  alt="{{ featured_resource.title }}"
@@ -72,7 +72,7 @@
         {% include "misc/paginator.html" with position="bottom" %}
 
         <!-- Confirmation modal for deleting featured -->
-        <form id="form-delete-featured" name="form" method="post" action="{% url "featured-resource-list-delete" %}" class="modal modal-flex">
+        <form id="form-delete-featured" name="form" method="post" action="{% url "featured:resource-list-delete" %}" class="modal modal-flex">
             {% csrf_token %}
             <p>{% trans "Attention, vous vous apprêtez à supprimer toutes les unes sélectionnées." %}</p>
             <button type="submit" name="delete_multi" class="btn btn-submit">{% trans "Confirmer" %}</button>

diff --git a/templates/featured/list_requests.html b/templates/featured/list_requests.html
@@ -61,17 +61,17 @@
                     <td>{{ featured_request.num_vote }}</td>
                     <td>
                         {%  if featured_request.rejected %}
-                            <button type="button" class="btn btn-grey ico-after cross unpick-action" data-url="{% url 'featured-resource-request-update' featured_request.pk %}"
+                            <button type="button" class="btn btn-grey ico-after cross unpick-action" data-url="{% url "featured:resource-request-update" featured_request.pk %}"
                                     data-operation="CONSIDER">{% trans "Ne plus ignorer" %}</button>
                         {% else %}
-                            <button type="button" class="btn btn-grey ico-after hide unpick-action" data-url="{% url 'featured-resource-request-update' featured_request.pk %}"
+                            <button type="button" class="btn btn-grey ico-after hide unpick-action" data-url="{% url "featured:resource-request-update" featured_request.pk %}"
                                     data-operation="REJECT">{% trans "Ignorer" %}</button>
                         {% endif %}
 
-                        <button type="button" class="btn btn-grey ico-after hide unpick-action" data-url="{% url 'featured-resource-request-update' featured_request.pk %}"
+                        <button type="button" class="btn btn-grey ico-after hide unpick-action" data-url="{% url "featured:resource-request-update" featured_request.pk %}"
                                 data-operation="REJECT_FOR_GOOD">{% trans "Ignorer définitivement" %}</button>
 
-                        <a href="{% url "featured-resource-create" %}?content_type={% if featured_request.type == 'TOPIC' %}topic{% else %}published_content{% endif %}&amp;content_id={{ featured_request.content_object.pk }}">
+                        <a href="{% url "featured:resource-create" %}?content_type={% if featured_request.type == 'TOPIC' %}topic{% else %}published_content{% endif %}&amp;content_id={{ featured_request.content_object.pk }}">
                             <button type="button" class="btn btn-grey ico-after star">{% trans "Nouvelle une" %}</button>
                         </a>
                     </td>
@@ -95,28 +95,28 @@
         <h3>{% trans "Filtres" %}</h3>
         <ul>
             <li>
-                <a href="{% url "featured-resource-requests" %}?type=topic" class="ico-after view {% if request.GET.type == "topic" %}selected{% endif %}">
+                <a href="{% url "featured:resource-requests" %}?type=topic" class="ico-after view {% if request.GET.type == "topic" %}selected{% endif %}">
                     {% trans "Sujets proposés" %}
                 </a>
             </li>
             <li>
-                <a href="{% url "featured-resource-requests" %}?type=content" class="ico-after view {% if request.GET.type == "content" %}selected{% endif %}">
+                <a href="{% url "featured:resource-requests" %}?type=content" class="ico-after view {% if request.GET.type == "content" %}selected{% endif %}">
                     {% trans "Contenus proposés" %}
                 </a>
             </li>
             <li>
-                <a href="{% url "featured-resource-requests" %}?type=ignored" class="ico-after view {% if request.GET.type == "ignored" %}selected{% endif %}">
+                <a href="{% url "featured:resource-requests" %}?type=ignored" class="ico-after view {% if request.GET.type == "ignored" %}selected{% endif %}">
                     {% trans "Requêtes ignorées" %}
                 </a>
             </li>
             <li>
-                <a href="{% url "featured-resource-requests" %}?type=accepted" class="ico-after view {% if request.GET.type == "accepted" %}selected{% endif %}">
+                <a href="{% url "featured:resource-requests" %}?type=accepted" class="ico-after view {% if request.GET.type == "accepted" %}selected{% endif %}">
                     {% trans "Requêtes acceptées" %}
                 </a>
             </li>
             {% if request.GET.type %}
                 <li>
-                    <a href="{% url "featured-resource-requests" %}" class="ico-after cross red">
+                    <a href="{% url "featured:resource-requests" %}" class="ico-after cross red">
                         {% trans "Annuler le filtre" %}
                     </a>
                 </li>

diff --git a/templates/featured/resource/update.html b/templates/featured/resource/update.html
@@ -38,7 +38,7 @@ <h3>{% trans "Actions" %}</h3>
                 <a href="#delete-featured-resource" class="open-modal ico-after cross blue">
                     {% trans "Supprimer la une" %}
                 </a>
-                <form action="{% url "featured-resource-delete" featured_resource.pk %}" method="post" id="delete-featured-resource" class="modal modal-flex">
+                <form action="{% url "featured:resource-delete" featured_resource.pk %}" method="post" id="delete-featured-resource" class="modal modal-flex">
                     <p>
                         {% trans "Attention, vous vous apprêtez à supprimer définitivement cette une." %}
                     </p>

diff --git a/templates/forum/topic/index.html b/templates/forum/topic/index.html
@@ -381,7 +381,7 @@ <h3>{% trans "Modération" %}</h3>
                 </li>
                 {% if perms.featured.change_featuredresource %}
                     <li>
-                        <a href="{% url "featured-resource-create" %}?content_type=topic&amp;content_id={{ topic.pk }}" class="ico-after star blue">
+                        <a href="{% url "featured:resource-create" %}?content_type=topic&amp;content_id={{ topic.pk }}" class="ico-after star blue">
                             {% trans "Ajouter en une" %}
                         </a>
                     </li>

diff --git a/templates/header.html b/templates/header.html
@@ -434,7 +434,7 @@ <h1 class="dropdown-title">{{ user.username|truncatechars:25 }}</h1>
 
                         {% if perms.featured.change_featuredresource %}
                             <li class="staff-only">
-                                <a href="{% url 'featured-resource-list' %}">{% trans 'Gestion des mises en avant' %}</a>
+                                <a href="{% url "featured:resource-list" %}">{% trans 'Gestion des mises en avant' %}</a>
                             </li>
                         {% endif %}
                         <li>

diff --git a/templates/home.html b/templates/home.html
@@ -97,7 +97,7 @@ <h1 class="home-heading heading-white ico-after ico-news" itemprop="name">
                 <span>{% trans "À la une" %}</span>
 
                 {% if perms.featured.change_featuredresource %}
-                    <a href="{% url "featured-resource-list" %}" class="btn btn-grey">{% trans "Gérer les unes" %}</a>
+                    <a href="{% url "featured:resource-list" %}" class="btn btn-grey">{% trans "Gérer les unes" %}</a>
                 {% endif %}
             </h1>
 

diff --git a/templates/tutorialv2/view/content_online.html b/templates/tutorialv2/view/content_online.html
@@ -337,7 +337,7 @@ <h3>{% blocktrans %}Admin<span class="wide">istration</span>{% endblocktrans %}<
                     </li>
                     {% if perms.featured.change_featuredresource %}
                         <li>
-                            <a href="{% url "featured-resource-create" %}?content_type=published_content&amp;content_id={{ content.pk }}"
+                            <a href="{% url "featured:resource-create" %}?content_type=published_content&amp;content_id={{ content.pk }}"
                                class="ico-after star blue">
                                 {% trans "Ajouter en une" %}
                             </a>

diff --git a/zds/featured/forms.py b/zds/featured/forms.py
@@ -56,7 +56,7 @@ def __init__(self, *args, **kwargs):
         self.helper = FormHelper()
         self.helper.form_class = "content-wrapper"
         self.helper.form_method = "post"
-        self.helper.form_action = reverse("featured-resource-create")
+        self.helper.form_action = reverse("featured:resource-create")
 
         fields = [Field("request"), Field("title"), Field("type"), Field("authors"), Field("image_url"), Field("url")]
 
@@ -92,7 +92,7 @@ def __init__(self, *args, **kwargs):
         self.helper = FormHelper()
         self.helper.form_class = "content-wrapper"
         self.helper.form_method = "post"
-        self.helper.form_action = reverse("featured-message-create")
+        self.helper.form_action = reverse("featured:message-create")
 
         self.helper.layout = Layout(
             Field("hook"),