diff --git a/openslides/agenda/models.py b/openslides/agenda/models.py index b94925bc1..40bebf658 100644 --- a/openslides/agenda/models.py +++ b/openslides/agenda/models.py @@ -178,7 +178,7 @@ class Item(InheritanceCastModel): permissions = ( ('can_see_agenda', "Can see agenda"), ('can_manage_agenda', "Can manage agenda"), - ('can_see_beamer', "Can see projector"), + ('can_see_projector', "Can see projector"), ) diff --git a/openslides/agenda/templates/agenda/base_agenda.html b/openslides/agenda/templates/agenda/base_agenda.html index 233bba88f..8a04aaaa0 100644 --- a/openslides/agenda/templates/agenda/base_agenda.html +++ b/openslides/agenda/templates/agenda/base_agenda.html @@ -10,7 +10,7 @@ {% if perms.agenda.can_manage_agenda %}
  • {%trans "New item" %}
  • {% endif %} - {% if perms.agenda.can_see_beamer %} + {% if perms.agenda.can_see_projector %}
  • {%trans 'Beamer view' %}
  • {% endif %} diff --git a/openslides/agenda/views.py b/openslides/agenda/views.py index 519219d26..57257f1c6 100644 --- a/openslides/agenda/views.py +++ b/openslides/agenda/views.py @@ -47,7 +47,7 @@ def view(request, item_id): context_instance=RequestContext(request)) -@permission_required('agenda.can_see_beamer') +@permission_required('agenda.can_see_projector') def beamer(request): """ Shows a active Slide. @@ -126,7 +126,6 @@ def assignment_votes(item): else: tmplist.append("-") votes.append(tmplist) - return votes diff --git a/openslides/application/views.py b/openslides/application/views.py index 433b46f20..b0f9f1961 100644 --- a/openslides/application/views.py +++ b/openslides/application/views.py @@ -163,7 +163,7 @@ def edit(request, application_id=None): 'application': application, } - +@permission_required('application.can_manage_application') @template('application/view.html') def delete(request, application_id): """