Portal: Migrate from can to has_perm

Author: chris34

inyoka_theme_default/templates/portal/base.html

@@ -11,7 +11,7 @@
 {% extends 'base.html' %}
 
 {% block title %}
-  {{ _('Portal') }} - {{ super() }}
+  {{ _('Portal') }} – {{ super() }}
 {% endblock %}
 
 {% set active_app = 'portal' %}
@@ -32,23 +32,20 @@
     {{ macros.sidebar_item(_('Calendar'), href('portal', 'calendar')) }}
   {% endcall %}
 
-  {% if USER.can('static_page_edit')
-    or USER.can('static_file_edit')
-    or USER.can('configuration_edit')
-    or USER.can('markup_css_edit')
+  {% if USER.has_perm('portal.change_staticpage')
+    or USER.has_perm('portal.change_staticfile')
+    or USER.has_perm('portal.change_storage')
   %}
     {% call macros.sidebar_admin() %}
-      {% if USER.can('configuration_edit') %}
-        {{ macros.sidebar_item(_('General'),href('portal', 'config')) }}
+      {% if USER.has_perm('portal.change_storage') %}
+        {{ macros.sidebar_item(_('General'), href('portal', 'config')) }}
       {% endif %}
-      {% if USER.can('markup_css_edit') %}
-        {{ macros.sidebar_item(_('Stylesheets'),href('portal', 'styles')) }}
+      {% if USER.has_perm('portal.change_staticpage') %}
+        {{ macros.sidebar_item(_('Stylesheets'), href('portal', 'styles')) }}
+        {{ macros.sidebar_item(_('Static pages'), href('portal', 'pages')) }}
       {% endif %}
-      {% if USER.can('static_page_edit') %}
-        {{ macros.sidebar_item(_('Static pages'),href('portal', 'pages')) }}
-      {% endif %}
-      {% if USER.can('static_file_edit') %}
-        {{ macros.sidebar_item(_('Static files'),href('portal', 'files')) }}
+      {% if USER.has_perm('portal.change_staticfile') %}
+        {{ macros.sidebar_item(_('Static files'), href('portal', 'files')) }}
       {% endif %}
     {% endcall %}
   {% endif %}

inyoka_theme_default/templates/portal/profile.html

@@ -23,7 +23,7 @@
 {% macro show_item(item) %}
   {% if user[item] and user.settings['show_'+item] %}
     <td>{{ user[item]|e }}</td>
-  {% elif user[item] and REQUEST.user.can('user_edit') %}
+  {% elif user[item] and REQUEST.user.has_perm('portal.change_user') %}
     <td class="hidden-info">{{ user[item]|e }}</td>
   {% else %}
     <td>–</td>
@@ -33,7 +33,7 @@
 {% block sidebar %}
 
   {% call macros.sidebar() %}
-    {% if request.user.can('subscribe_to_users') %}
+    {% if request.user.has_perm('portal.subscribe_user') %}
       {% call macros.sidebar_item() %}
         {% if is_subscribed %}
           {{ macros.outer_form(csrf_token(), action=href('portal', 'user', user.username, 'unsubscribe')|e , submit_label=_('Don’t watch anymore')) }}
@@ -47,7 +47,7 @@
     {{ macros.sidebar_item(_('show posts'), href('forum', 'author', user.username)) }}
   {% endcall %}
 
-  {% if request.user.can('user_edit') %}
+  {% if request.user.has_perm('portal.change_user') %}
     {% call macros.sidebar_admin() %}
       {{ macros.sidebar_item(_('Edit user'), href('portal', 'user', user.username, 'edit', 'profile')) }}
       {{ macros.sidebar_item(_('Edit groups'), href('portal', 'user', user.username, 'edit', 'groups')) }}
@@ -85,7 +85,7 @@ <h3>
         <th>{% trans %}Jabber{% endtrans %}</th>
         {% if user.jabber and user.settings['show_jabber'] %}
           <td><a href="{{ user.jabber_url|e }}">{{ user.jabber|e }}</a></td>
-        {% elif user.jabber and REQUEST.user.can('user_edit') %}
+        {% elif user.jabber and REQUEST.user.has_perm('portal.change_user') %}
           <td class="hidden-info">
             <a href="{{ user.jabber_url|e }}">{{ user.jabber|e }}</a>
           </td>