Skip to content
Snippets Groups Projects
Commit 24f7423e authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Merge branch...

Merge branch '135-make-chronos-compatible-to-other-haystack-search-backends-and-rules-based-search-filtering' into 'master'

Resolve "Make chronos compatible to other haystack search backends and rules-based search filtering"

Closes #135

See merge request !162
parents a47bec49 7521c998
No related branches found
No related tags found
1 merge request!162Resolve "Make chronos compatible to other haystack search backends and rules-based search filtering"
Pipeline #11880 passed
Pipeline: AlekSIS

#11882

    ......@@ -8,7 +8,7 @@ from aleksis.core.util.predicates import (
    )
    from .models import LessonSubstitution
    from .util.predicates import has_any_timetable_object, has_timetable_perm
    from .util.predicates import has_any_timetable_object, has_room_timetable_perm, has_timetable_perm
    # View timetable overview
    view_timetable_overview_predicate = has_person & (
    ......@@ -47,3 +47,7 @@ view_substitutions_predicate = has_person & (
    | has_any_object("chronos.view_lessonsubstitution_rule", LessonSubstitution)
    )
    add_perm("chronos.view_substitutions_rule", view_substitutions_predicate)
    # View room (timetable)
    view_room_predicate = has_person & has_room_timetable_perm
    add_perm("chronos.view_room_rule", view_room_predicate)
    {{ object.name }}
    {{ object.short_name }}
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment