Merge pull request #811 from alphagov/check-service-is-active

Check service is active
This commit is contained in:
Rebecca Law
2017-02-02 11:59:28 +00:00
committed by GitHub
11 changed files with 115 additions and 158 deletions

View File

@@ -59,7 +59,8 @@ class PermissionDAO(DAOClass):
db.session.commit()
def get_permissions_by_user_id(self, user_id):
return self.Meta.model.query.filter_by(user_id=user_id).all()
return self.Meta.model.query.filter_by(user_id=user_id)\
.join(Permission.service).filter_by(active=True).all()
permission_dao = PermissionDAO()