Grise les boutons de comparaisons de versions si elles sont identiques

Fix #6105
zestedesavoir · Oct 2, 2021 · 286bdcc · 286bdcc
1 parent 01ee0fa
commit 286bdcc
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 16 deletions.
diff --git a/templates/tutorialv2/view/content.html b/templates/tutorialv2/view/content.html
@@ -498,27 +498,54 @@ <h2>
         {# END ONLINE VERSION #}
 
         {% if content.sha_public %}
-            <li>
-                <a href="{% url "content:diff" content.pk content.slug_repository %}?from={{ content.sha_public }}&amp;to={% if version %}{{ version }}{% else %}{{ content.sha_draft }}{% endif %}" class="ico-after history blue">
-                    {% trans "Comparer avec la version en ligne" %}
-                </a>
-            </li>
+            {# interpreted as:  (version and (content.sha_public != version)) or ((not version) and (content.sha_public != content.sha_draft)) #}
+            {% if version and content.sha_public != version or not version and content.sha_public != content.sha_draft %}
+                <li>
+                    <a href="{% url "content:diff" content.pk content.slug_repository %}?from={{ content.sha_public }}&amp;to={% if version %}{{ version }}{% else %}{{ content.sha_draft }}{% endif %}" class="ico-after history blue">
+                        {% trans "Comparer avec la version en ligne" %}
+                    </a>
+                </li>
+            {% else %}
+                <li class="inactive">
+                    <span class="ico-after history disabled">
+                        {% trans "Comparer avec la version en ligne (identique)" %}
+                    </a>
+                </li>
+            {% endif %}
         {% endif %}
 
         {% if content.sha_beta %}
-            <li>
-                <a href="{% url "content:diff" content.pk content.slug_repository %}?from={{ content.sha_beta }}&amp;to={% if version %}{{ version }}{% else %}{{ content.sha_draft }}{% endif %}" class="ico-after history blue">
-                    {% trans "Comparer avec la bêta" %}
-                </a>
-            </li>
+            {# interpreted as:  (version and (content.sha_beta != version)) or ((not version) and (content.sha_beta != content.sha_draft)) #}
+            {% if version and content.sha_beta != version or not version and content.sha_beta != content.sha_draft %}
+                <li>
+                    <a href="{% url "content:diff" content.pk content.slug_repository %}?from={{ content.sha_beta }}&amp;to={% if version %}{{ version }}{% else %}{{ content.sha_draft }}{% endif %}" class="ico-after history blue">
+                        {% trans "Comparer avec la bêta" %}
+                    </a>
+                </li>
+            {% else %}
+                <li class="inactive">
+                    <span class="ico-after history disabled">
+                        {% trans "Comparer avec la bêta (identique)" %}
+                    </a>
+                </li>
+            {% endif %}
         {% endif %}
 
         {% if content.in_validation %}
-            <li>
-                <a href="{% url "content:diff" content.pk content.slug_repository %}?from={{ validation.version }}&amp;to={% if version %}{{ version }}{% else %}{{ content.sha_draft }}{% endif %}" class="ico-after history blue">
-                    {% trans "Comparer avec la version en validation" %}
-                </a>
-            </li>
+            {# interpreted as:  (version and (validation.version != version)) or ((not version) and (validation.version != content.sha_draft)) #}
+            {% if version and validation.version != version or not version and validation.version != content.sha_draft %}
+                <li>
+                    <a href="{% url "content:diff" content.pk content.slug_repository %}?from={{ validation.version }}&amp;to={% if version %}{{ version }}{% else %}{{ content.sha_draft }}{% endif %}" class="ico-after history blue">
+                        {% trans "Comparer avec la version en validation" %}
+                    </a>
+                </li>
+            {% else %}
+                <li class="inactive">
+                    <span class="ico-after history disabled">
+                        {% trans "Comparer avec la version en validation (identique)" %}
+                    </a>
+                </li>
+            {% endif %}
         {% endif %}
 
         {# HISTORY #}

diff --git a/zds/tutorialv2/mixins.py b/zds/tutorialv2/mixins.py
@@ -221,7 +221,7 @@ def get_context_data(self, **kwargs):
 
 class SingleContentDetailViewMixin(SingleContentViewMixin, DetailView):
     """
-    This enhanced DetailView ensure,
+    This enhanced DetailView ensures,
 
     - by rewriting `get()`, that:
         * `self.object` contains the result of `get_object()` (as it must be if `get()` is not rewritten)