Merge pull request #3531 from uktrade/develop

Release PR
uktrade · Oct 17, 2024 · f6acc89 · f6acc89
2 parents ad74597 + 0e9700c
commit f6acc89
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/config/helpers.py b/config/helpers.py
@@ -0,0 +1,13 @@
+import os
+
+
+def is_local():
+    return os.getenv('APP_ENVIRONMENT') is None
+
+
+def is_circleci():
+    return 'IS_CIRCLECI' in os.environ
+
+
+def get_env_files():
+    return ['config/env/' + filename for filename in os.getenv('ENV_FILES', '').split(',')]
diff --git a/contact/templates/domestic/contact/export-support/includes/cancel-button.html b/contact/templates/domestic/contact/export-support/includes/cancel-button.html
@@ -1,7 +1,7 @@
 
-{% if back_step == 3 %}
+{% if back_step == '3' %}
     <a href="{% url 'core:guided-journey-step-3' %}" class="govuk-link great-ds-skip-control"><span>Cancel changes</span></a>
-{% elif back_step == 4 %}
+{% elif back_step == '4' %}
     <a href="{% url 'core:guided-journey-step-4' %}" class="govuk-link great-ds-skip-control"><span>Cancel changes</span></a>
 {% else %}
     <a href="{{ url }}" class="govuk-link great-ds-skip-control"><span>Cancel changes</span></a>