From 147eb0dda670646133d424ea5aff7c432103aebe Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Thu, 5 Aug 2010 10:14:04 +0200 Subject: make permissions and tools part of all templates --- coip/apps/name/views.py | 8 +------- coip/multiresponse.py | 8 ++++++++ templates/apps/name/name.html | 23 ----------------------- templates/base.html | 27 ++++++++++++++++++++++++++- templates/tree.html | 4 ++-- 5 files changed, 37 insertions(+), 33 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): diff --git a/templates/apps/name/name.html b/templates/apps/name/name.html index 6a5929a..c746e44 100644 --- a/templates/apps/name/name.html +++ b/templates/apps/name/name.html @@ -13,29 +13,6 @@ active: false }); {% endblock %} -{% block tools %} -
-
-
    - {% if render.edit %} -
    • - {% endif %} - {% if render.edit %} -
    • - {% endif %} - {% if render.delete %} -
    • - {% endif %} - {% if render.insert %} -
    • - {% endif %} - {% if render.invite %} -
    • - {% endif %} -
-
-
-{% endblock %} {% block content %} {% if name.description %}
diff --git a/templates/base.html b/templates/base.html index 88198ae..78af32d 100644 --- a/templates/base.html +++ b/templates/base.html @@ -93,7 +93,32 @@
- {% block tools %}{% endblock %} + {% block tools %} +{% if name %} +
+
+
    + {% if render.edit %} +
    • + {% endif %} + {% if render.edit %} +
    • + {% endif %} + {% if render.delete %} +
    • + {% endif %} + {% if render.insert %} +
    • + {% endif %} + {% if render.invite %} +
    • + {% endif %} +
    • +
+
+
+{% endif %} +{% endblock %} {% endif %}
diff --git a/templates/tree.html b/templates/tree.html index 0d2e6cd..38ecfac 100644 --- a/templates/tree.html +++ b/templates/tree.html @@ -43,14 +43,14 @@ $(function() { {% if name and name.links %}

Related resources

{% if render.edit %} - + {% endif %}
-- cgit v1.1