diff --git a/aleksis/core/templates/core/base.html b/aleksis/core/templates/core/base.html index 1553f5511439dc551f4f29056c23568874bf8f07..cfa282265261e2fb7d3274ad54da41e878cc748c 100644 --- a/aleksis/core/templates/core/base.html +++ b/aleksis/core/templates/core/base.html @@ -70,7 +70,7 @@ alt="{{ request.site.preferences.general__title }} – Logo"> </a> </li> - {% has_perm 'core.search' user as search %} + {% has_perm 'core.search_rule' user as search %} {% if search %} <li class="search"> <form method="get" action="{% url "haystack_search" %}" id="search-form" class="autocomplete"> diff --git a/aleksis/core/templates/core/dashboard_widget/list.html b/aleksis/core/templates/core/dashboard_widget/list.html index 6715e3df96e2faed4a1afc78333529039000de32..ec5fac70d20c3997d2a02128691b947719eb4309 100644 --- a/aleksis/core/templates/core/dashboard_widget/list.html +++ b/aleksis/core/templates/core/dashboard_widget/list.html @@ -25,7 +25,7 @@ {% endfor %} </ul> - {% has_perm "core.edit_default_dashboard" user as can_edit_default_dashboard %} + {% has_perm "core.edit_default_dashboard_rule" user as can_edit_default_dashboard %} {% if can_edit_default_dashboard %} <a class="btn orange waves-effect waves-light" href="{% url "edit_default_dashboard" %}"> <i class="material-icons left">edit</i> diff --git a/aleksis/core/templates/core/group/full.html b/aleksis/core/templates/core/group/full.html index 1a15daf5c490c4cd1af12e7c43c02a3872c8b883..32a3791d2970374fa934d64bf89b29c54e9baef2 100644 --- a/aleksis/core/templates/core/group/full.html +++ b/aleksis/core/templates/core/group/full.html @@ -11,10 +11,10 @@ {% block content %} <h4>{{ group.name }} <small class="grey-text">{{ group.short_name }}</small></h4> - {% has_perm 'core.edit_group' user group as can_change_group %} - {% has_perm 'core.change_group_preferences' user group as can_change_group_preferences %} - {% has_perm 'core.delete_group' user group as can_delete_group %} - {% has_perm 'core.view_group_stats' user group as can_view_group_stats %} + {% has_perm 'core.edit_group_rule' user group as can_change_group %} + {% has_perm 'core.change_group_preferences_rule' user group as can_change_group_preferences %} + {% has_perm 'core.delete_group_rule' user group as can_delete_group %} + {% has_perm 'core.view_group_stats_rule' user group as can_view_group_stats %} {% if can_change_group or can_change_group_preferences or can_delete_group %} <p> diff --git a/aleksis/core/templates/core/index.html b/aleksis/core/templates/core/index.html index 44ebf73c243769b9d221dda1efbf1e499e460831..6bbbab8ecfbe2768d12eb139fae110ac5cf62371 100644 --- a/aleksis/core/templates/core/index.html +++ b/aleksis/core/templates/core/index.html @@ -9,7 +9,7 @@ {% endblock %} {% block content %} - {% has_perm "core.edit_dashboard" user as can_edit_dashboard %} + {% has_perm "core.edit_dashboard_rule" user as can_edit_dashboard %} {% if can_edit_dashboard %} <div class="row no-margin"> <a class="btn-flat waves-effect waves-light right" href="{% url "edit_dashboard" %}"> diff --git a/aleksis/core/templates/core/person/full.html b/aleksis/core/templates/core/person/full.html index 80aff9b9fe0b2d3c4146929758430b3401bf5270..2b2ba3fb0d9a47d298e3abab277ea4ae73cd01fd 100644 --- a/aleksis/core/templates/core/person/full.html +++ b/aleksis/core/templates/core/person/full.html @@ -10,10 +10,10 @@ {% block content %} <h4>{{ person.first_name }} {{ person.last_name }}</h4> - {% has_perm 'core.edit_person' user person as can_change_person %} - {% has_perm 'core.change_person_preferences' user person as can_change_person_preferences %} - {% has_perm 'core.delete_person' user person as can_delete_person %} - {% has_perm "core.impersonate" user person as can_impersonate %} + {% has_perm 'core.edit_person_rule' user person as can_change_person %} + {% has_perm 'core.change_person_preferences_rule' user person as can_change_person_preferences %} + {% has_perm 'core.delete_person_rule' user person as can_delete_person %} + {% has_perm "core.impersonate_rule" user person as can_impersonate %} {% if can_change_person or can_change_person_preferences or can_delete_person or can_impersonate %} <p> @@ -50,7 +50,7 @@ <h5>{% blocktrans %}Contact details{% endblocktrans %}</h5> <div class="row"> <div class="col s12 m4"> - {% has_perm 'core.view_photo' user person as can_view_photo %} + {% has_perm 'core.view_photo_rule' user person as can_view_photo %} {% if person.photo and can_view_photo %} <img class="person-img" src="{{ person.photo.url }}" alt="{{ person.first_name }} {{ person.last_name }}"/> @@ -78,7 +78,7 @@ </td> <td colspan="3">{{ person.get_sex_display }}</td> </tr> - {% has_perm 'core.view_address' user person as can_view_address %} + {% has_perm 'core.view_address_rule' user person as can_view_address %} {% if can_view_address %} <tr> <td> @@ -88,7 +88,7 @@ <td colspan="2">{{ person.postal_code }} {{ person.place }}</td> </tr> {% endif %} - {% has_perm 'core.view_contact_details' user person as can_view_contact_details %} + {% has_perm 'core.view_contact_details_rule' user person as can_view_contact_details %} {% if can_view_contact_details %} <tr> <td> @@ -104,7 +104,7 @@ <td colspan="3">{{ person.email }}</td> </tr> {% endif %} - {% has_perm 'core.view_personal_details' user person as can_view_personal_details %} + {% has_perm 'core.view_personal_details_rule' user person as can_view_personal_details %} {% if can_view_personal_details %} <tr> <td> @@ -139,7 +139,7 @@ </div> {% endif %} - {% has_perm 'core.view_person_groups' user person as can_view_groups %} + {% has_perm 'core.view_person_groups_rule' user person as can_view_groups %} {% if can_view_groups %} <h5>{% blocktrans %}Groups{% endblocktrans %}</h5> {% render_table groups_table %} diff --git a/aleksis/core/templates/core/person/list.html b/aleksis/core/templates/core/person/list.html index b48baf3e5ff8b0f229ab13dfb7c6b5a5885d105f..f91e2ef05b00f3a16fce23f67431e822aff3518a 100644 --- a/aleksis/core/templates/core/person/list.html +++ b/aleksis/core/templates/core/person/list.html @@ -9,7 +9,7 @@ {% block page_title %}{% blocktrans %}Persons{% endblocktrans %}{% endblock %} {% block content %} - {% has_perm 'core.create_person' user person as can_create_person %} + {% has_perm 'core.create_person_rule' user person as can_create_person %} {% if can_create_person %} <a class="btn green waves-effect waves-light" href="{% url 'create_person' %}"> diff --git a/aleksis/core/urls.py b/aleksis/core/urls.py index a80f45f5856d975dd9eaee180d921a63fbd6b416..05d56aa5574f3b7bf2bd2d88e63a695be200877c 100644 --- a/aleksis/core/urls.py +++ b/aleksis/core/urls.py @@ -109,12 +109,12 @@ urlpatterns = [ path("__i18n__/", include("django.conf.urls.i18n")), path( "ckeditor/upload/", - permission_required("core.ckeditor_upload_files")(ckeditor_uploader_views.upload), + permission_required("core.ckeditor_upload_files_rule")(ckeditor_uploader_views.upload), name="ckeditor_upload", ), path( "ckeditor/browse/", - permission_required("core.ckeditor_upload_files")(ckeditor_uploader_views.browse), + permission_required("core.ckeditor_upload_files_rule")(ckeditor_uploader_views.browse), name="ckeditor_browse", ), path("select2/", include("django_select2.urls")),