Merge pull request #106 from Crown-Commercial-Service/update-digitalm…

…arketplace-frontend Upgrade Digital Marketplace Frontend to v1.2.0
Crown-Commercial-Service · Sep 12, 2024 · de9d495 · de9d495
2 parents ee677da + 8ed5f65
commit de9d495
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,9 @@ Records breaking changes from major version bumps.
 
 ## Unreleased
 
-Upgrade Digital Marketplace Frontend to v1.1.1
+## 2.9.0
+
+Upgrade Digital Marketplace Frontend to v1.2.0
 
 Update CCS GOV.UK Frontend Jinja to v1.2.1 (GOV.UK Frontend 5.4.1)
 

diff --git a/digitalmarketplace_frontend_jinja/__init__.py b/digitalmarketplace_frontend_jinja/__init__.py
@@ -1 +1 @@
-__version__ = '2.8.0'
+__version__ = '2.9.0'
diff --git a/digitalmarketplace_frontend_jinja/templates/components/question-multiquestion/macro.html b/digitalmarketplace_frontend_jinja/templates/components/question-multiquestion/macro.html
@@ -9,6 +9,12 @@
       "classes": 'govuk-fieldset__legend--m'
     }
   }) %}
+    {% if params.question.question_advice %}
+      <div class="govuk-body">
+        {{ params.question.question_advice | safe }}
+      </div>
+    {% endif %}
+
     {% for question in params.question.questions %}
       {{ digitalmarketplaceQuestion({
         "type": question.type,

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -5,6 +5,6 @@
   "author": "CCS",
   "license": "MIT",
   "devDependencies": {
-    "digitalmarketplace-frontend": "^1.1.3"
+    "digitalmarketplace-frontend": "^1.2.0"
   }
 }
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -34,7 +34,7 @@ click==8.1.7
     # via flask
 contextlib2==21.6.0
     # via ccs-digitalmarketplace-utils
-cryptography==42.0.8
+cryptography==43.0.1
     # via ccs-digitalmarketplace-utils
 defusedxml==0.7.1
     # via odfpy