From fedd0d3c0b95d0efc6b1848db1d471d9cdf789de Mon Sep 17 00:00:00 2001
From: Hangzhi Yu <hangzhi@protonmail.com>
Date: Sat, 22 May 2021 00:23:42 +0200
Subject: [PATCH] Rename rules
---
aleksis/apps/alsijil/rules.py | 12 ++++++------
aleksis/apps/alsijil/tables.py | 8 ++++----
.../templates/alsijil/class_register/groups.html | 4 ++--
.../templates/alsijil/class_register/lesson.html | 12 ++++++------
.../templates/alsijil/class_register/person.html | 6 +++---
.../templates/alsijil/class_register/week_view.html | 6 +++---
.../alsijil/templates/alsijil/excuse_type/list.html | 2 +-
.../templates/alsijil/group_role/assigned_list.html | 4 ++--
.../alsijil/templates/alsijil/group_role/list.html | 2 +-
.../alsijil/group_role/partials/assigned_roles.html | 2 +-
.../group_role/partials/assignment_options.html | 6 +++---
.../alsijil/templates/alsijil/partials/absences.html | 2 +-
.../alsijil/partials/persons_with_stats.html | 2 +-
.../templates/alsijil/partials/tardinesses.html | 2 +-
14 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/aleksis/apps/alsijil/rules.py b/aleksis/apps/alsijil/rules.py
index bb7014100..0b418af8c 100644
--- a/aleksis/apps/alsijil/rules.py
+++ b/aleksis/apps/alsijil/rules.py
@@ -261,7 +261,7 @@ add_perm("alsijil.delete_grouprole_rule", delete_group_role_predicate)
view_assigned_group_roles_predicate = has_person & (
is_group_owner
- | has_global_perm("alsjil.assign_grouprole")
+ | has_global_perm("alsijil.assign_grouprole")
| has_object_perm("core.assign_grouprole")
)
add_perm("alsijil.view_assigned_grouproles_rule", view_assigned_group_roles_predicate)
@@ -270,7 +270,7 @@ view_assigned_group_roles_register_object_predicate = has_person & (
is_lesson_teacher
| is_lesson_original_teacher
| is_lesson_parent_group_owner
- | has_global_perm("alsjil.assign_grouprole")
+ | has_global_perm("alsijil.assign_grouprole")
)
add_perm(
"alsijil.view_assigned_grouproles_for_register_object",
@@ -278,12 +278,12 @@ add_perm(
)
assign_group_role_person_predicate = has_person & (
- is_person_group_owner | has_global_perm("alsjil.assign_grouprole")
+ is_person_group_owner | has_global_perm("alsijil.assign_grouprole")
)
add_perm("alsijil.assign_grouprole_to_person_rule", assign_group_role_person_predicate)
assign_group_role_for_multiple_predicate = has_person & (
- is_owner_of_any_group | has_global_perm("alsjil.assign_grouprole")
+ is_owner_of_any_group | has_global_perm("alsijil.assign_grouprole")
)
add_perm("alsijil.assign_grouprole_for_multiple_rule", assign_group_role_for_multiple_predicate)
@@ -291,7 +291,7 @@ assign_group_role_group_predicate = view_assigned_group_roles_predicate
add_perm("alsijil.assign_grouprole_for_group_rule", assign_group_role_group_predicate)
edit_group_role_assignment_predicate = has_person & (
- has_global_perm("alsjil.assign_grouprole") | is_group_role_assignment_group_owner
+ has_global_perm("alsijil.assign_grouprole") | is_group_role_assignment_group_owner
)
add_perm("alsijil.edit_grouproleassignment_rule", edit_group_role_assignment_predicate)
@@ -299,7 +299,7 @@ stop_group_role_assignment_predicate = edit_group_role_assignment_predicate
add_perm("alsijil.stop_grouproleassignment_rule", stop_group_role_assignment_predicate)
delete_group_role_assignment_predicate = has_person & (
- has_global_perm("alsjil.assign_grouprole") | is_group_role_assignment_group_owner
+ has_global_perm("alsijil.assign_grouprole") | is_group_role_assignment_group_owner
)
add_perm("alsijil.delete_grouproleassignment_rule", delete_group_role_assignment_predicate)
diff --git a/aleksis/apps/alsijil/tables.py b/aleksis/apps/alsijil/tables.py
index b0337d749..bf841edc5 100644
--- a/aleksis/apps/alsijil/tables.py
+++ b/aleksis/apps/alsijil/tables.py
@@ -51,9 +51,9 @@ class ExcuseTypeTable(tables.Table):
)
def before_render(self, request):
- if not request.user.has_perm("alsijil.edit_excusetype"):
+ if not request.user.has_perm("alsijil.edit_excusetype_rule"):
self.columns.hide("edit")
- if not request.user.has_perm("alsijil.delete_excusetype"):
+ if not request.user.has_perm("alsijil.delete_excusetype_rule"):
self.columns.hide("delete")
@@ -80,9 +80,9 @@ class GroupRoleTable(tables.Table):
return render_to_string("alsijil/group_role/chip.html", context)
def before_render(self, request):
- if not request.user.has_perm("alsijil.edit_grouprole"):
+ if not request.user.has_perm("alsijil.edit_grouprole_rule"):
self.columns.hide("edit")
- if not request.user.has_perm("alsijil.delete_grouprole"):
+ if not request.user.has_perm("alsijil.delete_grouprole_rule"):
self.columns.hide("delete")
diff --git a/aleksis/apps/alsijil/templates/alsijil/class_register/groups.html b/aleksis/apps/alsijil/templates/alsijil/class_register/groups.html
index f300f3b84..8c6254cdb 100644
--- a/aleksis/apps/alsijil/templates/alsijil/class_register/groups.html
+++ b/aleksis/apps/alsijil/templates/alsijil/class_register/groups.html
@@ -38,7 +38,7 @@
<i class="material-icons left">view_week</i>
{% trans "Week view" %}
</a>
- {% has_perm "alsijil.view_assigned_grouproles" user group as can_view_assigned_group_roles %}
+ {% has_perm "alsijil.view_assigned_grouproles_rule" user group as can_view_assigned_group_roles %}
{% if can_view_assigned_group_roles %}
<a class="btn primary waves-effect waves-light" href="{% url 'assigned_group_roles' group.pk %}">
<i class="material-icons left">assignment_ind</i>
@@ -82,7 +82,7 @@
{% trans "Week view" %}
</a>
</p>
- {% has_perm "alsijil.view_assigned_grouproles" user group as can_view_assigned_group_roles %}
+ {% has_perm "alsijil.view_assigned_grouproles_rule" user group as can_view_assigned_group_roles %}
{% if can_view_assigned_group_roles %}
<p>
<a class="btn primary waves-effect waves-light" href="{% url 'assigned_group_roles' group.pk %}">
diff --git a/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html b/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
index 94b8b8118..7092d63fc 100644
--- a/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
+++ b/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
@@ -66,9 +66,9 @@
</h4>
<br/>
- {% has_perm "alsijil.view_lessondocumentation" user register_object as can_view_lesson_documentation %}
- {% has_perm "alsijil.edit_lessondocumentation" user register_object as can_edit_lesson_documentation %}
- {% has_perm "alsijil.edit_register_object_personalnote" user register_object as can_edit_register_object_personalnote %}
+ {% has_perm "alsijil.view_lessondocumentation_rule" user register_object as can_view_lesson_documentation %}
+ {% has_perm "alsijil.edit_lessondocumentation_rule" user register_object as can_edit_lesson_documentation %}
+ {% has_perm "alsijil.edit_register_object_personalnote_rule" user register_object as can_edit_register_object_personalnote %}
<form method="post" class="row">
<p>
@@ -115,7 +115,7 @@
</li>
{% endif %}
{% if prev_lesson %}
- {% has_perm "alsijil.view_lessondocumentation" user prev_lesson as can_view_prev_lesson_documentation %}
+ {% has_perm "alsijil.view_lessondocumentation_rule" user prev_lesson as can_view_prev_lesson_documentation %}
{% if prev_lesson.get_lesson_documentation and can_view_prev_lesson_documentation %}
<li class="tab">
<a href="#previous-lesson">{% trans "Previous lesson" %}</a>
@@ -176,7 +176,7 @@
{% with prev_doc=prev_lesson.get_lesson_documentation %}
{% with absences=prev_lesson.get_absences tardinesses=prev_lesson.get_tardinesses extra_marks=prev_lesson.get_extra_marks %}
- {% has_perm "alsijil.view_lessondocumentation" user prev_lesson as can_view_prev_lesson_documentation %}
+ {% has_perm "alsijil.view_lessondocumentation_rule" user prev_lesson as can_view_prev_lesson_documentation %}
{% if prev_doc and can_view_prev_lesson_documentation %}
{% weekday_to_date prev_lesson.week prev_lesson.period.weekday as prev_date %}
<div class="col s12" id="previous-lesson">
@@ -228,7 +228,7 @@
<th>{{ extra_mark.name }}</th>
<td>
{% for note in notes %}
- {% has_perm "alsijil.view_personalnote" user note as can_view_personalnote %}
+ {% has_perm "alsijil.view_personalnote_rule" user note as can_view_personalnote %}
{% if can_view_personalnote %}
<span>{{ note.person }}{% if not forloop.last %},{% endif %}</span>
{% endif %}
diff --git a/aleksis/apps/alsijil/templates/alsijil/class_register/person.html b/aleksis/apps/alsijil/templates/alsijil/class_register/person.html
index 4d063d3dd..e73e48dca 100644
--- a/aleksis/apps/alsijil/templates/alsijil/class_register/person.html
+++ b/aleksis/apps/alsijil/templates/alsijil/class_register/person.html
@@ -11,7 +11,7 @@
{% block page_title %}
- {% has_perm "alsijil.view_my_students" user as has_students %}
+ {% has_perm "alsijil.view_my_students_rule" user as has_students %}
{% if has_students %}
<a href="{% url "my_students" %}"
class="btn-flat primary-color-text waves-light waves-effect">
@@ -23,7 +23,7 @@
Class register overview for {{ person }}
{% endblocktrans %}
</span>
- {% has_perm "alsijil.register_absence" user person as can_register_absence %}
+ {% has_perm "alsijil.register_absence_rule" user person as can_register_absence %}
{% if can_register_absence %}
<a class="btn primary-color waves-effect waves-light right" href="{% url "register_absence" person.pk %}">
<i class="material-icons left">rate_review</i>
@@ -80,7 +80,7 @@
</button>
</div>
</form>
- {% has_perm "alsijil.edit_person_overview_personalnote" user person as can_mark_all_as_excused %}
+ {% has_perm "alsijil.edit_person_overview_personalnote_rule" user person as can_mark_all_as_excused %}
<div class="row">
<div class="col s12 m3 l5 push-m9 push-l7">
<button
diff --git a/aleksis/apps/alsijil/templates/alsijil/class_register/week_view.html b/aleksis/apps/alsijil/templates/alsijil/class_register/week_view.html
index 970a07558..82d9fb4b9 100644
--- a/aleksis/apps/alsijil/templates/alsijil/class_register/week_view.html
+++ b/aleksis/apps/alsijil/templates/alsijil/class_register/week_view.html
@@ -112,7 +112,7 @@
</thead>
<tbody>
{% for register_object in objects %}
- {% has_perm "alsijil.view_lessondocumentation" user register_object as can_view_lesson_documentation %}
+ {% has_perm "alsijil.view_lessondocumentation_rule" user register_object as can_view_lesson_documentation %}
{% if can_view_lesson_documentation %}
<tr>
<td class="center-align">
@@ -192,7 +192,7 @@
<div class="collapsible-body">
<div class="collection">
{% for register_object in objects %}
- {% has_perm "alsijil.view_lessondocumentation" user register_object as can_view_lesson_documentation %}
+ {% has_perm "alsijil.view_lessondocumentation_rule" user register_object as can_view_lesson_documentation %}
{% if can_view_lesson_documentation %}
<a class="collection-item avatar"
href="{{ register_object.alsijil_url }}?back={{ back_url }}">
@@ -319,7 +319,7 @@
{% for person in persons %}
<h5 class="card-title">
<a href="{% url "overview_person" person.person.pk %}">{{ person.person.full_name }}</a>
- {% has_perm "alsijil.register_absence" user person.person as can_register_absence %}
+ {% has_perm "alsijil.register_absence_rule" user person.person as can_register_absence %}
{% if can_register_absence %}
<a class="btn primary-color waves-effect waves-light right"
href="{% url "register_absence" person.person.pk %}">
diff --git a/aleksis/apps/alsijil/templates/alsijil/excuse_type/list.html b/aleksis/apps/alsijil/templates/alsijil/excuse_type/list.html
index 9c74d62e1..c394784f0 100644
--- a/aleksis/apps/alsijil/templates/alsijil/excuse_type/list.html
+++ b/aleksis/apps/alsijil/templates/alsijil/excuse_type/list.html
@@ -11,7 +11,7 @@
{% block content %}
{% include "alsijil/excuse_type/warning.html" %}
- {% has_perm "alsijil.add_excusetype" user as add_excusetype %}
+ {% has_perm "alsijil.add_excusetype_rule" user as add_excusetype %}
{% if add_excusetype %}
<a class="btn green waves-effect waves-light" href="{% url 'create_excuse_type' %}">
<i class="material-icons left">add</i>
diff --git a/aleksis/apps/alsijil/templates/alsijil/group_role/assigned_list.html b/aleksis/apps/alsijil/templates/alsijil/group_role/assigned_list.html
index 087dffaaf..a5533b444 100644
--- a/aleksis/apps/alsijil/templates/alsijil/group_role/assigned_list.html
+++ b/aleksis/apps/alsijil/templates/alsijil/group_role/assigned_list.html
@@ -21,7 +21,7 @@
{% url "assigned_group_roles" object.pk as back_url %}
<p>
- {% has_perm "alsijil.view_my_groups" user as can_view_group_overview %}
+ {% has_perm "alsijil.view_my_groups_rule" user as can_view_group_overview %}
{% if can_view_group_overview %}
<a class="btn waves-effect waves-light" href="{% url "my_groups" %}">
<i class="material-icons left">arrow_back</i>
@@ -29,7 +29,7 @@
</a>
{% endif %}
- {% has_perm "alsijil.assign_grouprole_for_group" user object as can_assign_group_role %}
+ {% has_perm "alsijil.assign_grouprole_for_group_rule" user object as can_assign_group_role %}
{% if can_assign_group_role %}
<a class="btn green waves-effect waves-light" href="{% url "assign_group_role" object.pk %}">
<i class="material-icons left">assignment_ind</i>
diff --git a/aleksis/apps/alsijil/templates/alsijil/group_role/list.html b/aleksis/apps/alsijil/templates/alsijil/group_role/list.html
index f3e4a487e..73606d95b 100644
--- a/aleksis/apps/alsijil/templates/alsijil/group_role/list.html
+++ b/aleksis/apps/alsijil/templates/alsijil/group_role/list.html
@@ -9,7 +9,7 @@
{% block page_title %}{% blocktrans %}Group roles{% endblocktrans %}{% endblock %}
{% block content %}
- {% has_perm "alsijil.add_grouprole" user as add_group_role %}
+ {% has_perm "alsijil.add_grouprole_rule" user as add_group_role %}
{% if add_group_role %}
<a class="btn green waves-effect waves-light" href="{% url 'create_group_role' %}">
<i class="material-icons left">add</i>
diff --git a/aleksis/apps/alsijil/templates/alsijil/group_role/partials/assigned_roles.html b/aleksis/apps/alsijil/templates/alsijil/group_role/partials/assigned_roles.html
index bc8c16f02..349cd940c 100644
--- a/aleksis/apps/alsijil/templates/alsijil/group_role/partials/assigned_roles.html
+++ b/aleksis/apps/alsijil/templates/alsijil/group_role/partials/assigned_roles.html
@@ -1,5 +1,5 @@
{% load i18n rules %}
-{% has_perm "alsijil.assign_grouprole_for_group" user group as can_assign_group_role %}
+{% has_perm "alsijil.assign_grouprole_for_group_rule" user group as can_assign_group_role %}
<div class="collection">
{% for role in roles %}
<div class="collection-item">
diff --git a/aleksis/apps/alsijil/templates/alsijil/group_role/partials/assignment_options.html b/aleksis/apps/alsijil/templates/alsijil/group_role/partials/assignment_options.html
index ff50720db..6c6928934 100644
--- a/aleksis/apps/alsijil/templates/alsijil/group_role/partials/assignment_options.html
+++ b/aleksis/apps/alsijil/templates/alsijil/group_role/partials/assignment_options.html
@@ -2,9 +2,9 @@
{% load i18n rules %}
-{% has_perm "alsijil.edit_grouproleassignment" user assignment as can_edit %}
-{% has_perm "alsijil.stop_grouproleassignment" user assignment as can_stop %}
-{% has_perm "alsijil.delete_grouproleassignment" user assignment as can_delete %}
+{% has_perm "alsijil.edit_grouproleassignment_rule" user assignment as can_edit %}
+{% has_perm "alsijil.stop_grouproleassignment_rule" user assignment as can_stop %}
+{% has_perm "alsijil.delete_grouproleassignment_rule" user assignment as can_delete %}
<ul id="dropdown-{{ assignment.pk }}{{ suffix }}" class="dropdown-content">
{% if can_edit %}
diff --git a/aleksis/apps/alsijil/templates/alsijil/partials/absences.html b/aleksis/apps/alsijil/templates/alsijil/partials/absences.html
index c72204c55..d1faaadd4 100644
--- a/aleksis/apps/alsijil/templates/alsijil/partials/absences.html
+++ b/aleksis/apps/alsijil/templates/alsijil/partials/absences.html
@@ -1,6 +1,6 @@
{% load i18n rules %}
{% for note in notes %}
- {% has_perm "alsijil.view_personalnote" user note as can_view_personalnote %}
+ {% has_perm "alsijil.view_personalnote_rule" user note as can_view_personalnote %}
{% if can_view_personalnote %}
<span class="{% if note.excused %}green-text{% else %}red-text{% endif %}">{{ note.person }}
{% if note.excused %}{% if note.excuse_type %}({{ note.excuse_type.short_name }}){% else %}{% trans "(e)" %}{% endif %}{% else %}{% trans "(u)" %}{% endif %}{% if not forloop.last %},{% endif %}
diff --git a/aleksis/apps/alsijil/templates/alsijil/partials/persons_with_stats.html b/aleksis/apps/alsijil/templates/alsijil/partials/persons_with_stats.html
index 25341b1a6..ea78cc7eb 100644
--- a/aleksis/apps/alsijil/templates/alsijil/partials/persons_with_stats.html
+++ b/aleksis/apps/alsijil/templates/alsijil/partials/persons_with_stats.html
@@ -108,7 +108,7 @@
<span class="hide-on-large-only">{% trans "Details" %}</span>
</a>
- {% has_perm "alsijil.register_absence" user person as can_register_absence %}
+ {% has_perm "alsijil.register_absence_rule" user person as can_register_absence %}
{% if can_register_absence %}
<a class="btn primary-color waves-effect waves-light" href="{% url "register_absence" person.pk %}">
<i class="material-icons left">rate_review</i>
diff --git a/aleksis/apps/alsijil/templates/alsijil/partials/tardinesses.html b/aleksis/apps/alsijil/templates/alsijil/partials/tardinesses.html
index 3bb861916..d11a94ea1 100644
--- a/aleksis/apps/alsijil/templates/alsijil/partials/tardinesses.html
+++ b/aleksis/apps/alsijil/templates/alsijil/partials/tardinesses.html
@@ -1,6 +1,6 @@
{% load rules %}
{% for note in notes %}
- {% has_perm "alsijil.view_personalnote" user note as can_view_personalnote %}
+ {% has_perm "alsijil.view_personalnote_rule" user note as can_view_personalnote %}
{% if can_view_personalnote %}
<span>{{ note.person }} ({{ note.late }}'){% if not forloop.last %},{% endif %}</span>
{% endif %}
--
GitLab