diff --git a/aleksis/apps/alsijil/rules.py b/aleksis/apps/alsijil/rules.py index da480744939cb26ea6a3d08c9f93ffa1626973c8..c9321c4e1693414142f703b6a69d0d601c5b444b 100644 --- a/aleksis/apps/alsijil/rules.py +++ b/aleksis/apps/alsijil/rules.py @@ -9,7 +9,6 @@ from aleksis.core.util.predicates import ( is_current_person, ) -from .models import PersonalNoteFilter from .util.predicates import ( has_lesson_group_object_perm, has_person_group_object_perm, @@ -113,27 +112,6 @@ view_full_register_predicate = has_person & ( ) add_perm("alsijil.view_full_register", view_full_register_predicate) -# View all personal note filters -view_personal_note_filters_predicate = has_person & ( - has_global_perm("alsijil.view_personalnotefilter") - | has_any_object("alsijil.view_personalnotefilter", PersonalNoteFilter) -) -add_perm("alsijil.view_personal_note_filters", view_personal_note_filters_predicate) - -# Edit personal note filter -edit_personal_note_filter_predicate = has_person & ( - has_global_perm("alsijil.change_personalnotefilter") - | has_object_perm("alsijil.change_personalnotefilter") -) -add_perm("alsijil.edit_personal_note_filter", edit_personal_note_filter_predicate) - -# Delete personal note filter -delete_personal_note_filter_predicate = has_person & ( - has_global_perm("alsijil.delete_personalnotefilter") - | has_object_perm("alsijil.delete_personalnotefilter") -) -add_perm("alsijil.delete_personal_note_filter", delete_personal_note_filter_predicate) - # View excuse type list view_excusetypes_predicate = has_person & has_global_perm("alsijil.view_excusetype") add_perm("alsijil.view_excusetypes", view_excusetypes_predicate) diff --git a/aleksis/apps/alsijil/views.py b/aleksis/apps/alsijil/views.py index ba59131b1ef46910f3714b74d351571d13f8c03a..96be3b77eb52cc5bb4047b909a1b892954bf9155 100644 --- a/aleksis/apps/alsijil/views.py +++ b/aleksis/apps/alsijil/views.py @@ -34,8 +34,8 @@ from .forms import ( ) from .models import ExcuseType, ExtraMark, LessonDocumentation from .tables import ExcuseTypeTable, ExtraMarkTable -from .models import ExcuseType, LessonDocumentation, PersonalNoteFilter -from .tables import ExcuseTypeTable, PersonalNoteFilterTable +from .models import ExcuseType, LessonDocumentation +from .tables import ExcuseTypeTable from .util.alsijil_helpers import get_instance_by_pk, get_lesson_period_by_pk