diff options
author | 2013-03-20 21:39:30 +0100 | |
---|---|---|
committer | 2013-03-20 21:39:30 +0100 | |
commit | 63cef4c7d641ffddaeabcd768020674e2681ba05 (patch) | |
tree | 10b9ee50b927a7673d93db15b896a15a1012f482 /module/datatypes/User.py | |
parent | added ReadWrite lock, render file progress on dashboard (diff) | |
download | pyload-63cef4c7d641ffddaeabcd768020674e2681ba05.tar.xz |
improved ui, render waiting files
Diffstat (limited to 'module/datatypes/User.py')
-rw-r--r-- | module/datatypes/User.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/module/datatypes/User.py b/module/datatypes/User.py index bdf52d860..da7fb90bf 100644 --- a/module/datatypes/User.py +++ b/module/datatypes/User.py @@ -17,7 +17,8 @@ ############################################################################### -from module.Api import UserData, Permission, Role, has_permission +from module.Api import UserData, Permission, Role +from module.utils import bits_set #TODO: activate user #noinspection PyUnresolvedReferences @@ -39,11 +40,10 @@ class User(UserData): def hasPermission(self, perms): """ Accepts permission bit or name """ - if isinstance(perms, basestring) and hasattr(Permission, perms): perms = getattr(Role, perms) - return has_permission(self.permission, perms) + return bits_set(perms, self.permission) def hasRole(self, role): if isinstance(role, basestring) and hasattr(Role, role): |