Fix permission checking for publish_layer permission

The incorrect module name was being checked; previously this was only
tested with superusers (who get granted any permission requested, even
if it is invalid).

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
This commit is contained in:
Paul Eggleton 2013-03-27 11:05:05 +00:00
parent fd2be466bc
commit 49578f98c8
3 changed files with 6 additions and 6 deletions

View File

@ -55,7 +55,7 @@
<ul class="nav pull-right">
{% block submitlink %}<li><a href="{% url submit_layer %}">Submit layer</a></li>{% endblock %}
{% if user.is_authenticated %}
{% if perms.layeritem.publish_layer %}
{% if perms.layerindex.publish_layer %}
<li><a href="{% url layer_list_review %}?branch=master">
Review
{% if unpublished_count > 0 %}

View File

@ -32,7 +32,7 @@
{% endif %}
{% if user.is_authenticated %}
<span class="pull-right">
{% if perms.layeritem.publish_layer or useredit %}
{% if perms.layerindex.publish_layer or useredit %}
<a href="{% url edit_layer layeritem.name %}" class="btn">Edit layer</a>
{% if layeritem.layernote_set.count = 0 %}
<a href="{% url add_layernote layeritem.name %}" class="btn">Add note</a>
@ -57,7 +57,7 @@
{% for note in layeritem.layernote_set.all %}
<div class="alert">
<p>{{ note.text }}</p>
{% if perms.layeritem.publish_layer or useredit %}
{% if perms.layerindex.publish_layer or useredit %}
<p>
<a href="{% url edit_layernote layeritem.name note.pk %}" class="btn">Edit note</a>
<a href="{% url delete_layernote layeritem.name note.pk %}" class='btn'>Delete note</a>

View File

@ -34,13 +34,13 @@
{% endif %}
{% if user.is_authenticated %}
<span class="pull-right">
{% if perms.layeritem.publish_layer or useredit %}
{% if perms.layerindex.publish_layer or useredit %}
<a href="{% url edit_layer layeritem.name %}" class="btn">Edit layer</a>
{% if layeritem.layernote_set.count = 0 %}
<a href="{% url add_layernote layeritem.name %}" class="btn">Add note</a>
{% endif %}
{% endif %}
{% if layeritem.status = "N" and perms.layeritem.publish_layer %}
{% if layeritem.status = "N" and perms.layerindex.publish_layer %}
<a href="{% url delete_layer layeritem.name %}" class="btn btn-warning">Delete layer</a>
<a href="{% url publish layeritem.name %}" class="btn btn-primary">Publish layer</a>
{% endif %}
@ -63,7 +63,7 @@
{% for note in layeritem.layernote_set.all %}
<div class="alert">
<p>{{ note.text }}</p>
{% if perms.layeritem.publish_layer or useredit %}
{% if perms.layerindex.publish_layer or useredit %}
<p>
<a href="{% url edit_layernote layeritem.name note.pk %}" class="btn">Edit note</a>
<a href="{% url delete_layernote layeritem.name note.pk %}" class='btn'>Delete note</a>