From f1908bca890123f421e9615ee15ab2a307e37124 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
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 %}
         <a href="{{ item.get_absolute_url }}">{{ item }}</a>
     </td>
-    {% if perms.agenda.can_manage_agenda %}
+    {% if perms.agenda.can_manage_agenda or perms.projector.can_manage_projector %}
     <td>
         <span style="width: 1px; white-space: nowrap;">
-                <a class="activate_link {% if item.active %}active{% endif %}" href="{% url projector_activate_slide item.sid %}" title="{% trans 'Activate item' %}">
-                    <span></span>
-                </a>
-                <a href="{% url item_edit item.id %}"><img src="{% static 'images/icons/document-edit.png' %}" title="{% trans 'Edit item' %}"></a>
-                <a href="{% url item_delete item.id %}"><img src="{% static 'images/icons/edit-delete.png' %}" title="{% trans 'Delete item' %}"></a>
+        {% if perms.projector.can_manage_projector %}
+            <a class="activate_link {% if item.active %}active{% endif %}" href="{% url projector_activate_slide item.sid %}" title="{% trans 'Activate item' %}">
+                <span></span>
+            </a>
+        {% endif %}
+        {% if perms.agenda.can_manage_agenda %}
+            <a href="{% url item_edit item.id %}"><img src="{% static 'images/icons/document-edit.png' %}" title="{% trans 'Edit item' %}"></a>
+            <a href="{% url item_delete item.id %}"><img src="{% static 'images/icons/edit-delete.png' %}" title="{% trans 'Delete item' %}"></a>
+        {% endif %}
         </span>
     </td>
+    {% endif %}
+    {% if perms.agenda.can_manage_agenda %}
     <td class="tabledrag-hide">
         {% 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 @@
             <td>{{ application.creation_time }}</td>
             <td>
                 <span style="width: 1px; white-space: nowrap;">
+                {% if perms.projector.can_manage_projector %}
+                    <a class="activate_link {% if application.active %}active{% endif %}" href="{% url projector_activate_slide application.sid %}" title="{% trans 'Activate application' %}">
+                        <span></span>
+                    </a>
+                {% endif %}
                 {% if perms.application.can_manage_application %}
-                        <a class="activate_link {% if application.active %}active{% endif %}" href="{% url projector_activate_slide application.sid %}" title="{% trans 'Activate application' %}">
-                            <span></span>
-                        </a>
-                        <a href="{% url application_edit application.id %}"><img src="{% static 'images/icons/document-edit.png' %}" title="{% trans 'Edit application' %}"></a>
-                        <a href="#"><img src="{% static 'images/icons/edit-delete.png' %}" title="{% trans 'Delete application' %}"></a>
+                    <a href="{% url application_edit application.id %}"><img src="{% static 'images/icons/document-edit.png' %}" title="{% trans 'Edit application' %}"></a>
+                    <a href="#"><img src="{% static 'images/icons/edit-delete.png' %}" title="{% trans 'Delete application' %}"></a>
                 {% endif %}
                 <a href="{% url print_application application.id  %}" title="{%trans 'Application as PDF' %}"><img src="{% static 'images/icons/application-pdf.png' %}"></a>
                 </span>