Merge branch 'main' into 3021-create-aggregate-table-of-services-per-org

This commit is contained in:
Beverly Nguyen
2025-10-28 13:20:59 -07:00
9 changed files with 304 additions and 288 deletions

View File

@@ -846,9 +846,7 @@ def get_skip_link(step_index, template):
and step_index == 0
and template.template_type in ("sms", "email")
and not (template.template_type == "sms" and current_user.mobile_number is None)
and current_user.has_permissions(
ServicePermission.MANAGE_TEMPLATES, ServicePermission.MANAGE_SERVICE
)
and current_user.has_permissions(ServicePermission.SEND_MESSAGES)
):
return (
"Use my {}".format(first_column_headings[template.template_type][0]),