Hopiu/django-authority
1
0
Fork 0
mirror of https://github.com/jazzband/django-authority.git synced 2026-03-16 22:20:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Introduce a new syntax for the decorator to not rely on the order of the arguments passed to the view function. That failed because kwargs is a dict, d'oh.

Browse source
This commit is contained in:
Jannis Leidel 2009-07-06 16:03:56 +02:00
parent 52e8c07ff1
commit 6740e52369
2 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
example/exampleapp/views.py
View file

@ -4,8 +4,9 @@ from django.contrib.flatpages.models import FlatPage
from authority.decorators import permission_required, permission_required_or_403
#@permission_required_or_403('flatpage_permission.top_secret', (FlatPage, 'url__contains')) # use this to return a 403 page
@permission_required('flatpage_permission.top_secret', (FlatPage, 'url__contains'))
def top_secret(request, url):
@permission_required('flatpage_permission.top_secret', {
'url': (FlatPage, 'url__contains'), 'lala': (FlatPage, 'url__contains')})
def top_secret(request, url, lala=None):
"""
A wrapping view that performs the permission check given in the decorator
"""

22
src/authority/decorators.py
View file

@ -12,24 +12,26 @@ from django.contrib.auth import REDIRECT_FIELD_NAME
from authority import permissions
from authority.views import permission_denied
def permission_required(perm, *args, **kwargs):
def permission_required(perm, lookup_params=None, login_url=None,
redirect_field_name=REDIRECT_FIELD_NAME, redirect_to_login=True):
"""
Decorator for views that checks whether a user has a particular permission
enabled, redirecting to the log-in page if necessary.
"""
login_url = kwargs.pop('login_url', settings.LOGIN_URL)
redirect_field_name = kwargs.pop('redirect_field_name', REDIRECT_FIELD_NAME)
redirect_to_login = kwargs.pop('redirect_to_login', True)
model_lookups = args
if lookup_params is None:
lookup_params = {}
print lookup_params
if login_url is None:
login_url = settings.LOGIN_URL
def decorate(view_func):
def decorated(request, *args, **kwargs):
objs = []
if request.user.is_authenticated():
values = list(args) + kwargs.values()
for model_lookup, query in zip(model_lookups, values):
if query is None:
for name, value in kwargs.items():
lookup_param = lookup_params.get(name, None)
if None in (value, lookup_param):
continue
model, lookup = model_lookup
model, lookup = lookup_param
if isinstance(model, basestring):
model_class = get_model(*model.split("."))
else:
@ -41,7 +43,7 @@ def permission_required(perm, *args, **kwargs):
not issubclass(model_class, Model):
raise ValueError(
'The argument %s needs to be a model.' % model)
objs.append(get_object_or_404(model_class, **{lookup: query}))
objs.append(get_object_or_404(model_class, **{lookup: value}))
check = permissions.registry.get_check(request.user, perm)
if check is not None:
if check(*objs):