pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Formatting

Browse Source
This commit is contained in:
richard-dds 2019-08-06 14:27:38 -04:00
parent 96f1c0d295
commit 04b77c113c
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
atst/domain/csp/file_uploads.py
View File

@ -70,9 +70,11 @@ class AzureUploader(Uploader):
permission=BlobPermissions.READ, permission=BlobPermissions.READ,
expiry=datetime.utcnow() + self.timeout, expiry=datetime.utcnow() + self.timeout,
content_disposition=f"attachment; filename={filename}", content_disposition=f"attachment; filename={filename}",
protocol="https" protocol="https",
)
return bbs.make_blob_url(
self.container_name, object_name, protocol="https", sas_token=sas_token
) )
return bbs.make_blob_url(self.container_name, object_name, protocol="https", sas_token=sas_token)
class AwsUploader(Uploader): class AwsUploader(Uploader):
@ -126,4 +128,12 @@ class AwsUploader(Uploader):
signature_version="s3v4", region_name=self.region_name signature_version="s3v4", region_name=self.region_name
), ),
) )
return s3_client.generate_presigned_url("get_object", Params={"Bucket": self.bucket_name, "Key": object_name, "ResponseContentDisposition": f"attachment; filename={filename}"}, ExpiresIn=self.timeout_secs) return s3_client.generate_presigned_url(
"get_object",
Params={
"Bucket": self.bucket_name,
"Key": object_name,
"ResponseContentDisposition": f"attachment; filename={filename}",
},
ExpiresIn=self.timeout_secs,
)

11
atst/routes/task_orders/new.py
View File

@ -17,7 +17,9 @@ from atst.models.permissions import Permissions
from atst.utils.flash import formatted_flash as flash from atst.utils.flash import formatted_flash as flash
def render_task_orders_edit(template, portfolio_id=None, task_order_id=None, form=None, extra_args=None): def render_task_orders_edit(
template, portfolio_id=None, task_order_id=None, form=None, extra_args=None
):
render_args = extra_args or {} render_args = extra_args or {}
if task_order_id: if task_order_id:
@ -228,15 +230,16 @@ def form_step_four_review(task_order_id):
extra_args = { extra_args = {
"token": token, "token": token,
"object_name": object_name, "object_name": object_name,
"pdf_download_url": current_app.uploader.generate_download_link(task_order.pdf.object_name, task_order.pdf.filename) "pdf_download_url": current_app.uploader.generate_download_link(
task_order.pdf.object_name, task_order.pdf.filename
),
} }
if task_order.is_completed == False: if task_order.is_completed == False:
raise NoAccessError("task order form review") raise NoAccessError("task order form review")
return render_task_orders_edit( return render_task_orders_edit(
"task_orders/step_4.html", task_order_id=task_order_id, "task_orders/step_4.html", task_order_id=task_order_id, extra_args=extra_args
extra_args=extra_args,
) )