Skip to content

Commit 1ef4f79

Browse files
committed
Add template type check so text messages are not affected
1 parent 85fde4a commit 1ef4f79

File tree

1 file changed

+15
-14
lines changed

1 file changed

+15
-14
lines changed

app/main/views/send.py

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -199,23 +199,26 @@ def _should_show_set_sender_page(service_id, template) -> bool:
199199
@main.route("/services/<uuid:service_id>/send/<uuid:template_id>/set-sender", methods=["GET", "POST"])
200200
@user_has_permissions("send_messages", restrict_admin_usage=True)
201201
def set_sender(service_id, template_id):
202+
template = current_service.get_template_with_user_permission_or_403(template_id, current_user)
203+
202204
session["from_sender_flow_check"] = True
203205

204-
if current_service.email_sender_name is None:
205-
session["email_sender_backlinks"] = get_backlink_email_sender(current_service, template_id)
206+
if template.template_type == "email":
207+
if current_service.email_sender_name is None:
208+
session["email_sender_backlinks"] = get_backlink_email_sender(current_service, template_id)
206209

207-
return redirect(
208-
url_for(
209-
"main.service_email_sender_change",
210-
service_id=service_id,
211-
from_sender_flow="yes",
212-
template_id=template_id,
210+
return redirect(
211+
url_for(
212+
"main.service_email_sender_change",
213+
service_id=service_id,
214+
from_sender_flow="yes",
215+
template_id=template_id,
216+
)
213217
)
214-
)
215218

216-
if not current_service.email_reply_to_addresses:
217-
session["email_sender_backlinks"] = get_backlink_email_sender(current_service, template_id)
218-
return redirect(url_for("main.service_email_reply_to", service_id=service_id, template_id=template_id))
219+
if not current_service.email_reply_to_addresses:
220+
session["email_sender_backlinks"] = get_backlink_email_sender(current_service, template_id)
221+
return redirect(url_for("main.service_email_reply_to", service_id=service_id, template_id=template_id))
219222

220223
backlinks = session.get("email_sender_backlinks", [])
221224

@@ -228,8 +231,6 @@ def set_sender(service_id, template_id):
228231

229232
redirect_to_one_off = redirect(url_for(".send_one_off", service_id=service_id, template_id=template_id))
230233

231-
template = current_service.get_template_with_user_permission_or_403(template_id, current_user)
232-
233234
if template.template_type == "letter":
234235
return redirect_to_one_off
235236

0 commit comments

Comments
 (0)