Skip to content

Commit 85fde4a

Browse files
committed
Remove test mode inset from tour
1 parent 034843d commit 85fde4a

File tree

7 files changed

+14
-3
lines changed

7 files changed

+14
-3
lines changed

app/main/views/dashboard.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ def old_service_dashboard(service_id):
4747
@main.route("/services/<uuid:service_id>")
4848
@user_has_permissions()
4949
def service_dashboard(service_id):
50+
session["from_sender_flow_check"] = False
51+
5052
if session.get("invited_user_id"):
5153
session.pop("invited_user_id", None)
5254
session["service_id"] = service_id

app/main/views/send.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ def send_messages(service_id, template_id):
164164
form=form,
165165
allowed_file_extensions=Spreadsheet.ALLOWED_FILE_EXTENSIONS,
166166
error_summary_enabled=True,
167+
from_sender_flow=session.get("from_sender_flow_check", False),
167168
)
168169

169170

@@ -198,6 +199,8 @@ def _should_show_set_sender_page(service_id, template) -> bool:
198199
@main.route("/services/<uuid:service_id>/send/<uuid:template_id>/set-sender", methods=["GET", "POST"])
199200
@user_has_permissions("send_messages", restrict_admin_usage=True)
200201
def set_sender(service_id, template_id):
202+
session["from_sender_flow_check"] = True
203+
201204
if current_service.email_sender_name is None:
202205
session["email_sender_backlinks"] = get_backlink_email_sender(current_service, template_id)
203206

@@ -562,6 +565,7 @@ def send_one_off_step(service_id, template_id, step_index): # noqa: C901
562565
back_link=back_link,
563566
link_to_upload=(request.endpoint == "main.send_one_off_step" and step_index == 0),
564567
error_summary_enabled=True,
568+
from_sender_flow=session.get("from_sender_flow_check", False),
565569
)
566570

567571

@@ -1027,6 +1031,7 @@ def check_notification(service_id, template_id):
10271031
return render_template(
10281032
"views/notifications/check.html",
10291033
**_check_notification(service_id, template_id),
1034+
from_sender_flow=session.get("from_sender_flow_check", False),
10301035
)
10311036

10321037

@@ -1124,6 +1129,7 @@ def send_notification(service_id, template_id):
11241129
return render_template(
11251130
"views/notifications/check.html",
11261131
**_check_notification(service_id, template_id, exception),
1132+
from_sender_flow=session.get("from_sender_flow_check", False),
11271133
)
11281134

11291135
session.pop("placeholders")

app/main/views/templates.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ def as_error_dict(self) -> dict[str, int]:
104104
@user_has_permissions(allow_org_user=True)
105105
def view_template(service_id, template_id):
106106
session["email_sender_backlinks"] = []
107+
session["from_sender_flow_check"] = False
107108

108109
template = current_service.get_template(
109110
template_id,

app/main/views/tour.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ def tour_step(service_id, template_id, step_index):
9292
back_link=back_link,
9393
help="2",
9494
error_summary_enabled=True,
95+
from_sender_flow=session.get("from_sender_flow_check", False),
9596
)
9697

9798

@@ -130,6 +131,7 @@ def check_tour_notification(service_id, template_id):
130131
template=template,
131132
back_link=back_link,
132133
help="2",
134+
from_sender_flow=session.get("from_sender_flow_check", False),
133135
)
134136

135137

app/templates/views/notifications/check.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070

7171
{{ template|string }}
7272

73-
{% if current_service.trial_mode %}
73+
{% if current_service.trial_mode and from_sender_flow %}
7474
{% set insetHtml %}
7575
<p>Your service is in test mode. You can only:</p>
7676
<ul class="govuk-list govuk-list--bullet">

app/templates/views/send-test.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
</p>
4949
{% endif %}
5050

51-
{% if current_service.trial_mode %}
51+
{% if current_service.trial_mode and from_sender_flow %}
5252
{% set insetHtml %}
5353
<p>Your service is in test mode. You can only:</p>
5454
<ul class="govuk-list govuk-list--bullet">

app/templates/views/send.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
{{ page_header('Upload a list of {}'.format(999|recipient_count_label(template.template_type))) }}
2020

21-
{% if current_service.trial_mode %}
21+
{% if current_service.trial_mode and from_sender_flow %}
2222
{% set insetHtml %}
2323
<p>Your service is in test mode. You can only:</p>
2424
<ul class="govuk-list govuk-list--bullet">

0 commit comments

Comments
 (0)