Merge branch 'staging' into 171114893-pdf-bug

This commit is contained in:
dandds 2020-02-07 05:15:10 -05:00 committed by GitHub
commit 21decca4e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -19,6 +19,9 @@ from atst.models import (
def get_resources_from_context(view_args):
query = None
if view_args is None:
view_args = {}
if "portfolio_token" in view_args:
query = (
db.session.query(Portfolio)