Merge branch 'release/3.0.1'

yverdon · Jun 29, 2023 · dcfe2db · dcfe2db
2 parents 3002850 + 79ede6e
commit dcfe2db
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/geocity/apps/api/serializers.py b/geocity/apps/api/serializers.py
@@ -462,7 +462,9 @@ def to_representation(self, value):
                 ):
                     values[field.name] = getattr(validation, field.name)
 
-            rep[validation.department.group.name] = values
+            values["group_name"] = validation.department.group.name
+            values["description"] = validation.department.description
+            rep[convert_string_to_api_key(validation.department.group.name)] = values
         return rep
 
 

diff --git a/geocity/apps/reports/templates/reports/sections/sectionvalidation.html b/geocity/apps/reports/templates/reports/sections/sectionvalidation.html
@@ -9,7 +9,7 @@
         <div class="flex_container">
             <div class="flex_item-100">
                 {% for group, validation in request_data.properties.validations.items %}
-                    <h3>Validation: {{group}}</h3>
+                    <h3>Validation: {{validation.description}}</h3>
                     <span class="bold">Statut : </span>{{validation.validation_status}}<br>
                     {% if validation.comment_is_visible_by_author %}
                         <div class="flex_item-100" style="text-align: justify; text-justify: inter-character;"><span class="bold">Commentaire : </span>{{validation.comment}}</div><br>

diff --git a/geocity/apps/submissions/management/fixturize_data/demo_example.py b/geocity/apps/submissions/management/fixturize_data/demo_example.py
@@ -48,7 +48,7 @@
 }
 field_title = {
     "name": "Texte permettant de séparer visuellement les champs",
-    "input_type": "title",
+    "input_type": "title_output",
     "help_text": "Ce texte permet d'expliquer en détail à l'utilisateur les pourquoi et le comment des informations à fournir",
     "is_mandatory": False,
 }

diff --git a/geocity/apps/submissions/management/fixturize_data/fixturize.py b/geocity/apps/submissions/management/fixturize_data/fixturize.py
@@ -53,7 +53,7 @@
 }
 field_title = {
     "name": "Texte permettant de séparer visuellement les champs",
-    "input_type": "title",
+    "input_type": "title_output",
     "help_text": "Ce texte permet d'expliquer en détail à l'utilisateur les pourquoi et le comment des informations à fournir",
     "is_mandatory": False,
 }

diff --git a/geocity/apps/submissions/management/fixturize_data/generic_example.py b/geocity/apps/submissions/management/fixturize_data/generic_example.py
@@ -50,7 +50,7 @@
 }
 field_title = {
     "name": "Texte permettant de séparer visuellement les champs",
-    "input_type": "title",
+    "input_type": "title_output",
     "help_text": "Ce texte permet d'expliquer en détail à l'utilisateur les pourquoi et le comment des informations à fournir",
     "is_mandatory": False,
 }