darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-09 05:33:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update templates.py

Browse Source
This commit is contained in:
Jonathan Bobel
2025-03-19 14:35:22 -04:00
parent b5203f473a
commit 937aa5af15
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/main/views/templates.py
View File

@@ -695,9 +695,10 @@ def _get_content_count_error_and_message_for_template(template):
"""Check if the content contains explicitly blocked characters.""" """Check if the content contains explicitly blocked characters."""
return any(c in BLOCKED_CHARACTERS for c in content) return any(c in BLOCKED_CHARACTERS for c in content)
warning = "" # Check for blocked characters
if contains_blocked_characters(template.content): # Block only disallowed characters if contains_blocked_characters(template.content):
warning = f"{s1}{s2}" warning = f"{s1}{s2}"
return False, Markup(warning) # 🚨 ONLY show the warning, hiding "Will be charged..."
# If message is too long, return the length error # If message is too long, return the length error
if template.is_message_too_long(): if template.is_message_too_long():
@@ -707,17 +708,13 @@ def _get_content_count_error_and_message_for_template(template):
f"too many" f"too many"
) )
# Show charge message as usual if no warning
if template.placeholders: if template.placeholders:
return False, Markup( return False, Markup(
f"Will be charged as {message_count(template.fragment_count, template.template_type)} " f"Will be charged as {message_count(template.fragment_count, template.template_type)} "
f"(not including personalization). {warning}" f"(not including personalization)."
) )
# If there's a warning, return it alone and hide the "Will be charged as..." text
if warning:
return False, Markup(warning)
# Otherwise, show the message count as usual
return False, Markup( return False, Markup(
f"Will be charged as {message_count(template.fragment_count, template.template_type)}." f"Will be charged as {message_count(template.fragment_count, template.template_type)}."
) )