Hopiu/django-authority
1
0
Fork 0
mirror of https://github.com/jazzband/django-authority.git synced 2026-05-24 07:03:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make use of new helper method introduced with the permission assigning features.

Browse source
This commit is contained in:
Jannis Leidel 2010-01-15 22:35:01 +01:00
parent 567de09ca5
commit 32883905a4
1 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
authority/permissions.py
View file

@ -88,32 +88,28 @@ class BasePermission(object):
continue
# first check Django's permission system
if self.user:
perm = '%s.%s' % (obj._meta.app_label, check.lower())
if generic:
perm = '%s_%s' % (perm, obj._meta.object_name.lower())
perm = self.get_django_codename(check, obj, generic)
perms = perms or self.user.has_perm(perm)
perm = '%s.%s' % (self.label, check.lower())
if generic:
perm = '%s_%s' % (perm, obj._meta.object_name.lower())
perm = self.get_codename(check, obj, generic)
# then check authority's per object permissions
if not isinstance(obj, ModelBase) and isinstance(obj, self.model):
# only check the authority if obj is not a model class
perms = perms or self.has_perm(perm, obj)
return perms
def get_django_codename(self, check, model, generic=False, without_left=False):
def get_django_codename(self, check, model_or_instance, generic=False, without_left=False):
if without_left:
perm = check
else:
perm = '%s.%s' % (model._meta.app_label, check.lower())
perm = '%s.%s' % (model_or_instance._meta.app_label, check.lower())
if generic:
perm = '%s_%s' % (perm, model._meta.object_name.lower())
perm = '%s_%s' % (perm, model_or_instance._meta.object_name.lower())
return perm
def get_codename(self, check, model, generic=False):
def get_codename(self, check, model_or_instance, generic=False):
perm = '%s.%s' % (self.label, check.lower())
if generic:
perm = '%s_%s' % (perm, model._meta.object_name.lower())
perm = '%s_%s' % (perm, model_or_instance._meta.object_name.lower())
return perm
def assign(self, check=None, content_object=None, generic=False):
@ -135,10 +131,7 @@ class BasePermission(object):
content_objects = content_object
if not check:
print "Not passing a check argument is not supported"
print "I can't get the god damn test to pass"
#checks = self.generic_checks + getattr(self, 'checks', [])
checks = self.checks
checks = self.generic_checks + getattr(self, 'checks', [])
elif not isinstance(check, (list, tuple)):
checks = (check,)
else: