From f1908bca890123f421e9615ee15ab2a307e37124 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Fri, 20 Apr 2012 22:58:57 +0200 Subject: [PATCH] Fixed permissions for action columns. --- .../agenda/templates/agenda/item_row.html | 18 ++++++++++++------ .../templates/application/overview.html | 12 +++++++----- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/openslides/agenda/templates/agenda/item_row.html b/openslides/agenda/templates/agenda/item_row.html index d9f58e873..fc477eb8b 100644 --- a/openslides/agenda/templates/agenda/item_row.html +++ b/openslides/agenda/templates/agenda/item_row.html @@ -19,16 +19,22 @@ {% endif %} {{ item }} - {% if perms.agenda.can_manage_agenda %} + {% if perms.agenda.can_manage_agenda or perms.projector.can_manage_projector %} - - - - - + {% if perms.projector.can_manage_projector %} + + + + {% endif %} + {% if perms.agenda.can_manage_agenda %} + + + {% endif %} + {% endif %} + {% if perms.agenda.can_manage_agenda %} {% with form=item.weight_form %} {{ form.weight }} diff --git a/openslides/application/templates/application/overview.html b/openslides/application/templates/application/overview.html index cbbb711ca..fab80be16 100644 --- a/openslides/application/templates/application/overview.html +++ b/openslides/application/templates/application/overview.html @@ -62,12 +62,14 @@ {{ application.creation_time }} + {% if perms.projector.can_manage_projector %} + + + + {% endif %} {% if perms.application.can_manage_application %} - - - - - + + {% endif %}