From 86df0124c153b6f88548ff12a4714edcb9860b48 Mon Sep 17 00:00:00 2001 From: Jimmy Zelinskie Date: Wed, 30 Mar 2016 16:51:32 -0400 Subject: [PATCH] service keys: join with approvals Also fixes a bug where we weren't reassigning the query after adding a WHERE. --- data/model/service_keys.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/model/service_keys.py b/data/model/service_keys.py index 82a3cdcb6..4cfc30764 100644 --- a/data/model/service_keys.py +++ b/data/model/service_keys.py @@ -111,7 +111,7 @@ def approve_service_key(kid, approver, approval_type): def _list_service_keys_query(kid=None, service=None, approved_only=False): - query = ServiceKey.select() + query = ServiceKey.select().join(ServiceKeyApproval) if approved_only: query = query.where(~(ServiceKey.approval >> None)) @@ -122,7 +122,7 @@ def _list_service_keys_query(kid=None, service=None, approved_only=False): ~(_stale_unapproved_keys_clause(service))) if kid is not None: - query.where(ServiceKey.kid == kid) + query = query.where(ServiceKey.kid == kid) return query