darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-04 02:11:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge and fix conflicts.

Browse Source
This commit is contained in:
Nicholas Staples
2016-03-01 11:59:50 +00:00
parent 22f550dd34 4e678ac391
commit 7d43b4265f
3 changed files with 90 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/dao/permissions_dao.py
View File

@@ -37,7 +37,7 @@ class PermissionDAO(DAOClass):
query.filter_by(service=Service.query.get(service_ids[0]))
# TODO the join method for multiple services
if 'user' in filter_by_dict:
user_ids = filter_by_dict.getlist('service')
user_ids = filter_by_dict.getlist('user')
if len(user_ids) == 1:
query = query.filter_by(user=User.query.get(user_ids[0]))
# TODO the join method for multiple users