darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-15 07:18:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3453 from alphagov/accept-file-id-in-url

Browse Source 
Accept file_id in URL instead of as form parameter when sending uploaded letter
This commit is contained in:
Chris Hill-Scott
2020-05-21 13:33:27 +01:00
committed by GitHub
parent d7739669a2 1c5e661264
commit bead6a9ad6
2 changed files with 63 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/main/views/uploads.py
View File

@@ -339,13 +339,14 @@ def view_letter_upload_as_preview(service_id, file_id):
@main.route("/services/<uuid:service_id>/upload-letter/send", methods=['POST'])
@main.route("/services/<uuid:service_id>/upload-letter/send/<uuid:file_id>", methods=['POST'])
@user_has_permissions('send_messages', restrict_admin_usage=True)
def send_uploaded_letter(service_id):
def send_uploaded_letter(service_id, file_id=None):
if not (current_service.has_permission('letter') and current_service.has_permission('upload_letters')):
abort(403)
form = LetterUploadPostageForm()
file_id = form.file_id.data
form = LetterUploadPostageForm(file_id=file_id)
file_id = file_id or form.file_id.data
if not form.validate_on_submit():
return uploaded_letter_preview(service_id, file_id)