From ad6781f76ecfeae4f0624b9197ee44c285328e5b Mon Sep 17 00:00:00 2001 From: Patrick Smith Date: Wed, 2 Jan 2019 11:26:29 -0500 Subject: [PATCH 1/2] Use new "Workspaces.create" to create sample workspace --- script/seed_sample.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/seed_sample.py b/script/seed_sample.py index fb416843..8d62759a 100644 --- a/script/seed_sample.py +++ b/script/seed_sample.py @@ -108,7 +108,7 @@ def seed_db(): ) workspace = Workspaces.create( - request, name="{}'s workspace".format(user.first_name) + user, name="{}'s workspace".format(user.first_name) ) for workspace_role in WORKSPACE_USERS: ws_role = Workspaces.create_member(user, workspace, workspace_role) From 074e8aa0525930cdb860b0b907507c704419ad0b Mon Sep 17 00:00:00 2001 From: Patrick Smith Date: Wed, 2 Jan 2019 11:26:48 -0500 Subject: [PATCH 2/2] Handle workspace reports for workspaces without a request --- atst/routes/workspaces/index.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/atst/routes/workspaces/index.py b/atst/routes/workspaces/index.py index 5157ac97..2bdcd6d2 100644 --- a/atst/routes/workspaces/index.py +++ b/atst/routes/workspaces/index.py @@ -58,7 +58,9 @@ def workspace_reports(workspace_id): prev_month = current_month - timedelta(days=28) two_months_ago = prev_month - timedelta(days=28) - expiration_date = workspace.request.legacy_task_order.expiration_date + expiration_date = ( + workspace.legacy_task_order and workspace.legacy_task_order.expiration_date + ) if expiration_date: remaining_difference = expiration_date - today remaining_days = remaining_difference.days @@ -71,7 +73,7 @@ def workspace_reports(workspace_id): workspace_totals=Reports.workspace_totals(workspace), monthly_totals=Reports.monthly_totals(workspace), jedi_request=workspace.request, - legacy_task_order=workspace.request.legacy_task_order, + legacy_task_order=workspace.legacy_task_order, current_month=current_month, prev_month=prev_month, two_months_ago=two_months_ago,