diff options
| author | Jessica Tallon <jessica@megworld.co.uk> | 2014-07-25 18:58:57 +0100 |
|---|---|---|
| committer | Jessica Tallon <jessica@megworld.co.uk> | 2014-07-29 20:29:02 +0100 |
| commit | 7bfc81b21af65c91dcbd9d33deae2f020d8bbbee (patch) | |
| tree | 1b9cb32e5f8de29f8356b22cf38547c48c720810 /mediagoblin/templates | |
| parent | 97650abd784ba4c2ce902e7d00f7e007479c870f (diff) | |
| download | mediagoblin-7bfc81b21af65c91dcbd9d33deae2f020d8bbbee.tar.lz mediagoblin-7bfc81b21af65c91dcbd9d33deae2f020d8bbbee.tar.xz mediagoblin-7bfc81b21af65c91dcbd9d33deae2f020d8bbbee.zip | |
Fix #923 - add allow_admin to user_has_privilege decorator
Diffstat (limited to 'mediagoblin/templates')
| -rw-r--r-- | mediagoblin/templates/mediagoblin/base.html | 6 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/moderation/user.html | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index 63a2a6ff..13cfb47b 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -72,8 +72,8 @@ </div> <div class="header_right"> {%- if request.user %} - {% if request.user and - request.user.has_privilege('active') and + {% if request.user and + request.user.has_privilege('active') and not request.user.is_banned() %} {% set notification_count = get_notification_count(request.user.id) %} @@ -158,7 +158,7 @@ {%- trans %}Create new collection{% endtrans -%} </a> {% template_hook("header_dropdown_buttons") %} - {% if request.user.has_privilege('admin','moderator') %} + {% if request.user.has_privilege('moderator') %} <p> <span class="dropdown_title">{% trans %}Moderation powers:{% endtrans %}</span> <a href="{{ request.urlgen('mediagoblin.moderation.media_panel') }}"> diff --git a/mediagoblin/templates/mediagoblin/moderation/user.html b/mediagoblin/templates/mediagoblin/moderation/user.html index 37e7eee9..594f845d 100644 --- a/mediagoblin/templates/mediagoblin/moderation/user.html +++ b/mediagoblin/templates/mediagoblin/moderation/user.html @@ -175,7 +175,7 @@ {% for privilege in privileges %} <tr> <td>{{ privilege.privilege_name }}</td> - {% if privilege in user.all_privileges %} + {% if user.has_privilege(privilege.privilege_name) %} <td class="user_with_privilege"> {% trans %}Yes{% endtrans %}{% else %} <td class="user_without_privilege"> @@ -183,7 +183,7 @@ </td> {% if request.user.has_privilege('admin') %} <td> - {% if privilege in user.all_privileges %} + {% if user.has_privilege(privilege.privilege_name) %} <input type=submit id="{{ privilege.privilege_name }}" class="submit_button button_action" value =" -" /> |