Skip to content

Commit

Permalink
Merge pull request #61 from marblestation/get_myads_include_construct…
Browse files Browse the repository at this point in the history
…ed_general_query

Include the constructed general query in the private get-myads endpoint
  • Loading branch information
marblestation committed Jul 29, 2020
2 parents a7110ba + 56c249f commit 6652f5b
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions vault_service/views/user.py
Expand Up @@ -752,11 +752,12 @@ def get_myads(user_id):
try:
q = session.query(Query).filter_by(id=s.query_id).one()
qid = q.qid
query = None
except ormexc.NoResultFound:
qid = None
query = None

else:
data = _get_general_query_data(session, s.query_id)
query = _create_myads_query(s.template, s.frequency, data, classes=s.classes)
else:
qid = None
data = s.data.encode('utf-8') if s.data else s.data
Expand Down

0 comments on commit 6652f5b

Please sign in to comment.