From 63cef4c7d641ffddaeabcd768020674e2681ba05 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Wed, 20 Mar 2013 21:39:30 +0100 Subject: improved ui, render waiting files --- module/datatypes/User.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'module/datatypes/User.py') 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): -- cgit v1.2.3