From c1e6b67f20f366d7d676f322289d859f45313433 Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Fri, 23 Aug 2024 19:01:10 +0200
Subject: [PATCH] =?UTF-8?q?Am=C3=A9liore=20page=20affichage=20ScoValueErro?=
 =?UTF-8?q?r?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/scodoc/sco_exceptions.py     |  6 ++++--
 app/templates/sco_value_error.j2 | 14 ++++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/scodoc/sco_exceptions.py b/app/scodoc/sco_exceptions.py
index 741ad9fd..a7057883 100644
--- a/app/scodoc/sco_exceptions.py
+++ b/app/scodoc/sco_exceptions.py
@@ -52,10 +52,12 @@ class ScoValueError(ScoException):
 
     # mal nommée: super classe de toutes les exceptions avec page
     # d'erreur gentille.
-    def __init__(self, msg, dest_url=None, safe=False):
+    def __init__(self, msg, dest_url=None, dest_label=None, safe=False):
         super().__init__(msg)
+        # champs utilisés par template sco_value_error.j2
         self.dest_url = dest_url
-        self.safe = safe  # utilisé par template sco_value_error.j2
+        self.dest_label = dest_label
+        self.safe = safe
 
 
 class ScoPermissionDenied(ScoValueError):
diff --git a/app/templates/sco_value_error.j2 b/app/templates/sco_value_error.j2
index 2a488c93..15b3fdee 100644
--- a/app/templates/sco_value_error.j2
+++ b/app/templates/sco_value_error.j2
@@ -11,15 +11,21 @@
     {{ exc }}
 {% endif %}
 
+{% if exc.dest_url is not string or exc.dest_url|length > 0 %}
 <div style="margin-top: 16px;">
-    {% if g.scodoc_dept %}
-    <a class="stdlink" href="{{ exc.dest_url or url_for('scolar.index_html', scodoc_dept=g.scodoc_dept) }}">continuer</a>
-    {% elif exc.dest_url %}
-        <a class="stdlink" href="{{ exc.dest_url or url_for('scodoc.index') }}">continuer</a>
+    {% if exc.dest_url %}
+        <a class="stdlink" href="{{ exc.dest_url or url_for('scodoc.index') }}">
+        {{exc.dest_label or 'continuer'}}
+        </a>
+    {% elif g.scodoc_dept %}
+    <a class="stdlink" href="{{
+        url_for('scolar.index_html', scodoc_dept=g.scodoc_dept)
+    }}">retour page département</a>
     {% else %}
         <a class="stdlink" href="{{ exc.dest_url or url_for('scodoc.index') }}">retour page d'accueil</a>
     {% endif %}
 </div>
+{% endif %}
 
 <p style="margin-top: 32px;" class="help">
 Si le problème persiste, merci de contacter le support ScoDoc via