From 7c9c1f21684c4c86f6cc4b05fef949237d51ea7c Mon Sep 17 00:00:00 2001
From: chausman <chausman@nrao.edu>
Date: Tue, 13 Oct 2020 13:11:22 -0600
Subject: [PATCH] workflow file persistence now working
---
services/workflow/src/workflow/server.py | 2 +-
shared/workspaces/src/workspaces/schema.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/services/workflow/src/workflow/server.py b/services/workflow/src/workflow/server.py
index 452a7b7e6..e91c0e7a8 100644
--- a/services/workflow/src/workflow/server.py
+++ b/services/workflow/src/workflow/server.py
@@ -218,7 +218,7 @@ def main(global_config, **settings):
config.add_route('create_workflow_request', '/workflows/{name}/requests/create', factory=lookup_workflow)
config.add_route('workflow_request', '/workflows/requests/{request_id}', factory=lookup_request)
config.add_route('workflow_request_files', '/workflows/requests/{request_id}/files', factory=lookup_request)
- config.add_route('workflow_request_file', '/workflows/requests/{request_id}/files/{filename}', factory=lookup_file)
+ config.add_route('workflow_request_file', '/workflows/requests/{request_id}/files/{filename}', factory=lookup_request)
config.add_route('submit_workflow_request', '/workflows/requests/{request_id}/submit', factory=lookup_request)
config.include('pyramid_beaker')
diff --git a/shared/workspaces/src/workspaces/schema.py b/shared/workspaces/src/workspaces/schema.py
index 1091e7b47..700a60c13 100644
--- a/shared/workspaces/src/workspaces/schema.py
+++ b/shared/workspaces/src/workspaces/schema.py
@@ -480,7 +480,7 @@ class WorkflowRequestFile(Base):
return f"<WorkflowRequestFile filename={self.filename}>"
def __json__(self, request):
- return {'filename': self.filename}
+ return {"filename": self.filename, "content": self.content.decode("utf8")}
def get_engine():
--
GitLab