ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated permissions.

Browse Source
This commit is contained in:
Emanuel Schuetze 2011-09-04 12:33:06 +02:00
parent d1d0e7e9b4
commit 57ea883d51
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openslides/agenda/models.py
View File

@ -178,7 +178,7 @@ class Item(InheritanceCastModel):
permissions = ( permissions = (
('can_see_agenda', "Can see agenda"), ('can_see_agenda', "Can see agenda"),
('can_manage_agenda', "Can manage agenda"), ('can_manage_agenda', "Can manage agenda"),
('can_see_beamer', "Can see projector"), ('can_see_projector', "Can see projector"),
) )

2
openslides/agenda/templates/agenda/base_agenda.html
View File

@ -10,7 +10,7 @@
{% if perms.agenda.can_manage_agenda %} {% if perms.agenda.can_manage_agenda %}
<li class="{% active request '/item/new/' %}"><a href="{% url item_new 'ItemText' %}">{%trans "New item" %}</a></li> <li class="{% active request '/item/new/' %}"><a href="{% url item_new 'ItemText' %}">{%trans "New item" %}</a></li>
{% endif %} {% endif %}
{% if perms.agenda.can_see_beamer %} {% if perms.agenda.can_see_projector %}
<li><a href="{% url item_beamer %}"><img src="/static/images/icons/view-presentation.png"> {%trans 'Beamer view' %}</a></li> <li><a href="{% url item_beamer %}"><img src="/static/images/icons/view-presentation.png"> {%trans 'Beamer view' %}</a></li>
{% endif %} {% endif %}
</ul> </ul>

3
openslides/agenda/views.py
View File

@ -47,7 +47,7 @@ def view(request, item_id):
context_instance=RequestContext(request)) context_instance=RequestContext(request))
@permission_required('agenda.can_see_beamer') @permission_required('agenda.can_see_projector')
def beamer(request): def beamer(request):
""" """
Shows a active Slide. Shows a active Slide.
@ -126,7 +126,6 @@ def assignment_votes(item):
else: else:
tmplist.append("-") tmplist.append("-")
votes.append(tmplist) votes.append(tmplist)
return votes return votes

2
openslides/application/views.py
View File

@ -163,7 +163,7 @@ def edit(request, application_id=None):
'application': application, 'application': application,
} }
@permission_required('application.can_manage_application')
@template('application/view.html') @template('application/view.html')
def delete(request, application_id): def delete(request, application_id):
""" """