summaryrefslogtreecommitdiff
path: root/coip
diff options
context:
space:
mode:
Diffstat (limited to 'coip')
-rw-r--r--coip/apps/name/views.py8
-rw-r--r--coip/multiresponse.py8
2 files changed, 9 insertions, 7 deletions
diff --git a/coip/apps/name/views.py b/coip/apps/name/views.py
index f4eaf1d..de5c3af 100644
--- a/coip/apps/name/views.py
+++ b/coip/apps/name/views.py
@@ -118,13 +118,7 @@ def show(request,name):
{'text/html': 'apps/name/name.html'},
{'name': name,
'memberships':memberships,
- 'invitations':invitations,
- 'render': {'delete': name.has_permission(request.user,'d'),
- 'insert': name.has_permission(request.user,'i'),
- 'edit': name.has_permission(request.user,'w'),
- 'invite': name.has_permission(request.user,'i'),
- 'up': name.parent and name.parent.has_permission(request.user,'r')}
- })
+ 'invitations':invitations})
else:
return render403()
diff --git a/coip/multiresponse.py b/coip/multiresponse.py
index d3597ed..a67052c 100644
--- a/coip/multiresponse.py
+++ b/coip/multiresponse.py
@@ -30,6 +30,14 @@ def make_response_dict(request,d={}):
d['user'] = request.user
d['profile'] = user_profile(request)
+ if d.has_key('name'):
+ name = d['name']
+ d['render'] = {'delete': name.has_permission(request.user,'d'),
+ 'insert': name.has_permission(request.user,'i'),
+ 'edit': name.has_permission(request.user,'w'),
+ 'invite': name.has_permission(request.user,'i'),
+ 'up': name.parent and name.parent.has_permission(request.user,'r')}
+
return d
def json_response(data):