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

Merge pull request #512 from dod-ccpo/fix-nightly-test

Browse Source 
Fix nightly test deployment
This commit is contained in:
patricksmithdds 2019-01-02 13:23:55 -05:00 committed by GitHub
commit ac13f47a4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
atst/routes/workspaces/index.py
View File

@ -58,7 +58,9 @@ def workspace_reports(workspace_id):
prev_month = current_month - timedelta(days=28) prev_month = current_month - timedelta(days=28)
two_months_ago = prev_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: if expiration_date:
remaining_difference = expiration_date - today remaining_difference = expiration_date - today
remaining_days = remaining_difference.days remaining_days = remaining_difference.days
@ -71,7 +73,7 @@ def workspace_reports(workspace_id):
workspace_totals=Reports.workspace_totals(workspace), workspace_totals=Reports.workspace_totals(workspace),
monthly_totals=Reports.monthly_totals(workspace), monthly_totals=Reports.monthly_totals(workspace),
jedi_request=workspace.request, jedi_request=workspace.request,
legacy_task_order=workspace.request.legacy_task_order, legacy_task_order=workspace.legacy_task_order,
current_month=current_month, current_month=current_month,
prev_month=prev_month, prev_month=prev_month,
two_months_ago=two_months_ago, two_months_ago=two_months_ago,

2
script/seed_sample.py
View File

@ -108,7 +108,7 @@ def seed_db():
) )
workspace = Workspaces.create( 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: for workspace_role in WORKSPACE_USERS:
ws_role = Workspaces.create_member(user, workspace, workspace_role) ws_role = Workspaces.create_member(user, workspace, workspace_role)