diff options
author | Leif Johansson <leifj@sunet.se> | 2011-03-09 14:18:22 +0100 |
---|---|---|
committer | Leif Johansson <leifj@sunet.se> | 2011-03-09 14:18:22 +0100 |
commit | a3f8c2ad50f999f2f71526090fff951c928636f3 (patch) | |
tree | 1c392672fd8fec48705eee4c795e4e5ff196502d | |
parent | 5b35fa0902c6b12df986234a557ed5466dc3097d (diff) |
align with acl check style
-rw-r--r-- | coip/apps/name/views.py | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/coip/apps/name/views.py b/coip/apps/name/views.py index 8da5451..1fb38e8 100644 --- a/coip/apps/name/views.py +++ b/coip/apps/name/views.py @@ -160,20 +160,21 @@ def show(request,name): if not name: raise Http404() - if name.has_permission(request.user,'r'): - memberships = None - invitations = None - if name.has_permission(request.user,'l'): - memberships = name.memberships - invitations = name.invitations - return respond_to(request, - {'text/html': 'apps/name/name.html', - 'application/json': json_response(name.summary()) }, - {'name': name, - 'memberships':memberships, - 'invitations':invitations}) - else: - return render403() + if not name.has_permission(request.user,'r'): + return render403("You are not allowed to look at that group.") + + memberships = None + invitations = None + if name.has_permission(request.user,'l'): + memberships = name.memberships.filter(hidden=False) + invitations = name.invitations + return respond_to(request, + {'text/html': 'apps/name/name.html', + 'application/json': json_response(name.summary()) }, + {'name': name, + 'memberships':memberships, + 'invitations':invitations}) + def user_groups(request,username): user = get_object_or_404(User,username=username) |