Merge branch 'master' into forgot-password

This commit is contained in:
Rebecca Law
2016-03-09 10:47:00 +00:00
5 changed files with 17 additions and 5 deletions

View File

@@ -88,7 +88,7 @@ class User(UserMixin):
if service_id in self._permissions:
if or_:
return any([x in self._permissions[service_id] for x in permissions])
return set(self._permissions[service_id]) > set(permissions)
return set(self._permissions[service_id]) >= set(permissions)
return False
@property