Fix bug in PermissionDAO

Refactor user/test_rest
Remove conftest/sample_admin_service
This commit is contained in:
Rebecca Law
2016-03-01 10:34:27 +00:00
parent 5aa2243e81
commit ecbfbbc6b0
3 changed files with 82 additions and 123 deletions

View File

@@ -29,7 +29,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