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

made changes to the token and removed extra handling errors

Browse Source
This commit is contained in:
Beverly Nguyen
2024-03-08 15:05:44 -08:00
parent 2822b63a49
commit 7479a6c4ea
3 changed files with 9 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -634,32 +634,16 @@ def check_messages(service_id, template_id, upload_id, row_index=2):
@main.route( @main.route(
"/services/<uuid:service_id>/<uuid:template_id>/check/<uuid:upload_id>/preview", "/services/<uuid:service_id>/<uuid:template_id>/check/<uuid:upload_id>/preview",
methods=["GET"], methods=["POST"],
) )
@main.route( @main.route(
"/services/<uuid:service_id>/<uuid:template_id>/check/<uuid:upload_id>/preview/row-<int:row_index>", "/services/<uuid:service_id>/<uuid:template_id>/check/<uuid:upload_id>/preview/row-<int:row_index>",
methods=["GET"], methods=["POST"],
) )
@user_has_permissions("send_messages", restrict_admin_usage=True) @user_has_permissions("send_messages", restrict_admin_usage=True)
def preview_job(service_id, template_id, upload_id, row_index=2): def preview_job(service_id, template_id, upload_id, row_index=2):
session["scheduled_for"] = request.args.get("scheduled_for", "") session["scheduled_for"] = request.form.get("scheduled_for", "")
data = _check_messages(service_id, template_id, upload_id, row_index) data = _check_messages(service_id, template_id, upload_id, row_index)
data["allowed_file_extensions"] = Spreadsheet.ALLOWED_FILE_EXTENSIONS
if (
data["recipients"].too_many_rows
or not data["count_of_recipients"]
or not data["recipients"].has_recipient_columns
or data["recipients"].duplicate_recipient_column_headers
or data["recipients"].missing_column_headers
or data["sent_previously"]
):
return render_template("views/check/column-errors.html", **data)
if data["row_errors"]:
return render_template("views/check/row-errors.html", **data)
if data["errors"]:
return render_template("views/check/column-errors.html", **data)
return render_template( return render_template(
"views/check/preview.html", "views/check/preview.html",
@@ -907,7 +891,7 @@ def get_template_error_dict(exception):
@main.route( @main.route(
"/services/<uuid:service_id>/template/<uuid:template_id>/notification/check/preview", "/services/<uuid:service_id>/template/<uuid:template_id>/notification/check/preview",
methods=["GET"], methods=["POST"],
) )
@user_has_permissions("send_messages", restrict_admin_usage=True) @user_has_permissions("send_messages", restrict_admin_usage=True)
def preview_notification(service_id, template_id): def preview_notification(service_id, template_id):
@@ -921,7 +905,7 @@ def preview_notification(service_id, template_id):
) )
) )
session["scheduled_for"] = request.args.get("scheduled_for", "") session["scheduled_for"] = request.form.get("scheduled_for", "")
return render_template( return render_template(
"views/notifications/preview.html", "views/notifications/preview.html",

3
app/templates/views/check/ok.html
View File

@@ -22,7 +22,8 @@
{{ template|string }} {{ template|string }}
<div class="bottom-gutter-3-2"> <div class="bottom-gutter-3-2">
<form method="get" enctype="multipart/form-data" action="{{url_for('main.preview_job', service_id=current_service.id, template_id=template_id, upload_id=upload_id)}}" class='page-footer'> <form method="post" enctype="multipart/form-data" action="{{url_for('main.preview_job', service_id=current_service.id, template_id=template_id, upload_id=upload_id)}}" class='page-footer'>
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
{% if choose_time_form %} {% if choose_time_form %}
{{ choose_time_form.scheduled_for(param_extensions={ {{ choose_time_form.scheduled_for(param_extensions={
'formGroup': {'classes': 'bottom-gutter-2-3'}, 'formGroup': {'classes': 'bottom-gutter-2-3'},

3
app/templates/views/notifications/check.html
View File

@@ -46,11 +46,12 @@
{{ template|string }} {{ template|string }}
<div class="js-stick-at-bottom-when-scrolling"> <div class="js-stick-at-bottom-when-scrolling">
<form method="get" enctype="multipart/form-data" action="{{url_for( <form method="post" enctype="multipart/form-data" action="{{url_for(
'main.preview_notification', 'main.preview_notification',
service_id=current_service.id, service_id=current_service.id,
template_id=template.id template_id=template.id
)}}" class='page-footer'> )}}" class='page-footer'>
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
{% if not error %} {% if not error %}
{% if choose_time_form %} {% if choose_time_form %}
{{ choose_time_form.scheduled_for(param_extensions={ {{ choose_time_form.scheduled_for(param_extensions={