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

Merge branch 'main' of https://github.com/GSA/notifications-admin into 2554-add-cancel-button-and-modal-to-preview-send-page

Browse Source
This commit is contained in:
Jonathan Bobel
2025-05-14 17:01:56 -04:00
parent 9b8d0c2b2f e8c0f985c7
commit f8c47f0194
11 changed files with 4207 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
app/main/views/send.py
View File

@@ -566,18 +566,18 @@ def _check_messages(service_id, template_id, upload_id, preview_row, **kwargs):
"url": url_for(
"main.send_one_off", service_id=service_id, template_id=template.id
),
"text": "Back to message personalization"
"text": "Back to message personalization",
},
"html": "Back to message personalization"
"html": "Back to message personalization",
}
back_link_from_preview = {
"href": {
"url": url_for(
"main.send_one_off", service_id=service_id, template_id=template.id
),
"text": "Back to message personalization"
"text": "Back to message personalization",
},
"html": "Back to message personalization"
"html": "Back to message personalization",
}
choose_time_form = None
else:
@@ -586,9 +586,9 @@ def _check_messages(service_id, template_id, upload_id, preview_row, **kwargs):
"url": url_for(
"main.send_messages", service_id=service_id, template_id=template.id
),
"text": "Back to upload a file"
"text": "Back to upload a file",
},
"html": "Back to upload a file"
"html": "Back to upload a file",
}
back_link_from_preview = {
"href": {
@@ -598,9 +598,9 @@ def _check_messages(service_id, template_id, upload_id, preview_row, **kwargs):
template_id=template.id,
upload_id=upload_id,
),
"text": "Back to check messages"
"text": "Back to check messages",
},
"html": "Back to check messages"
"html": "Back to check messages",
}
choose_time_form = ChooseTimeForm()
@@ -786,9 +786,9 @@ def get_back_link(
service_id=service_id,
template_id=template.id,
),
"text": "Back to select delivery time"
"text": "Back to select delivery time",
},
"html": "Back to select delivery time"
"html": "Back to select delivery time",
}
if step_index == 0:
@@ -799,9 +799,9 @@ def get_back_link(
".choose_template",
service_id=service_id,
),
"text": "Back to all templates"
"text": "Back to all templates",
},
"html": "Back to all templates"
"html": "Back to all templates",
}
else:
return {
@@ -811,14 +811,16 @@ def get_back_link(
service_id=service_id,
template_id=template.id,
),
"text": "Back to confirm your template"
"text": "Back to confirm your template",
},
"html": "Back to confirm your template"
"html": "Back to confirm your template",
}
# fallback for other steps
back_to_text = (
"Back to select recipients" if step_index == 1 else "Back to message personalization"
"Back to select recipients"
if step_index == 1
else "Back to message personalization"
)
return {
@@ -829,9 +831,9 @@ def get_back_link(
template_id=template.id,
step_index=step_index - 1,
),
"text": back_to_text
"text": back_to_text,
},
"html": back_to_text
"html": back_to_text,
}

12
app/main/views/tour.py
View File

@@ -142,13 +142,11 @@ def _get_tour_step_back_link(service_id, template_id, step_index):
return {
"href": {
"url": url_for(
'main.begin_tour',
service_id=service_id,
template_id=template_id
"main.begin_tour", service_id=service_id, template_id=template_id
),
"text": "Back to tour start"
"text": "Back to tour start",
},
"html": "Back to tour start"
"html": "Back to tour start",
}
else:
return {
@@ -207,9 +205,9 @@ def check_tour_notification(service_id, template_id):
template_id=template_id,
step_index=len(placeholders),
),
"text": "Back to previous step"
"text": "Back to previous step",
},
"html": "Back to previous step"
"html": "Back to previous step",
}
template.values = get_recipient_and_placeholders_from_session(

2
app/s3_client/s3_csv_client.py
View File

@@ -31,7 +31,7 @@ def get_csv_upload(service_id, upload_id):
def remove_blank_lines(filedata):
# sometimes people upload files with hundreds of blank lines at the end
data = filedata["data"]
cleaned_data = "\n".join(line for line in data.splitlines() if line.strip())
cleaned_data = "\r\n".join(line for line in data.splitlines() if line.strip())
filedata["data"] = cleaned_data
return filedata