CHANGELOG.rst

@@ -9,6 +9,11 @@ and this project adheres to `Semantic Versioning`_.
 Unreleased
 ----------
 
+Removed
+~~~~~~~
+
+* Data template for `room` model used for haystack search indexing moved to core.
+
 Added
 ~~~~~
 

aleksis/apps/chronos/frontend/index.js

@@ -10,6 +10,9 @@ export default
         hasPersonValidator
       ]
     },
+    props: {
+      byTheGreatnessOfTheAlmightyAleksolotlISwearIAmWorthyOfUsingTheLegacyBaseTemplate: true,
+    },
     children: [
       {
         path: "",
@@ -21,6 +24,9 @@ export default
           icon: "mdi-grid",
           permission: "chronos.view_timetable_overview_rule",
         },
+        props: {
+          byTheGreatnessOfTheAlmightyAleksolotlISwearIAmWorthyOfUsingTheLegacyBaseTemplate: true,
+        },
       },
       {
         path: "timetable/my/",
@@ -32,31 +38,49 @@ export default
           icon: "mdi-account-outline",
           permission: "chronos.view_my_timetable_rule",
         },
+        props: {
+          byTheGreatnessOfTheAlmightyAleksolotlISwearIAmWorthyOfUsingTheLegacyBaseTemplate: true,
+        },
       },
       {
         path: "timetable/my/:year/:month/:day/",
         component: () => import("aleksis.core/components/LegacyBaseTemplate.vue"),
         name: "chronos.myTimetableByDate",
+        props: {
+          byTheGreatnessOfTheAlmightyAleksolotlISwearIAmWorthyOfUsingTheLegacyBaseTemplate: true,
+        },
       },
       {
         path: "timetable/:type_/:pk/",
         component: () => import("aleksis.core/components/LegacyBaseTemplate.vue"),
         name: "chronos.timetable",
+        props: {
+          byTheGreatnessOfTheAlmightyAleksolotlISwearIAmWorthyOfUsingTheLegacyBaseTemplate: true,
+        },
       },
       {
         path: "timetable/:type_/:pk/:year/:week/",
         component: () => import("aleksis.core/components/LegacyBaseTemplate.vue"),
         name: "chronos.timetableByWeek",
+        props: {
+          byTheGreatnessOfTheAlmightyAleksolotlISwearIAmWorthyOfUsingTheLegacyBaseTemplate: true,
+        },
       },
       {
         path: "timetable/:type_/:pk/print/",
         component: () => import("aleksis.core/components/LegacyBaseTemplate.vue"),
         name: "chronos.timetablePrint",
+        props: {
+          byTheGreatnessOfTheAlmightyAleksolotlISwearIAmWorthyOfUsingTheLegacyBaseTemplate: true,
+        },
       },
       {
         path: "timetable/:type_/:pk/:regular/",
         component: () => import("aleksis.core/components/LegacyBaseTemplate.vue"),
         name: "chronos.timetableRegular",
+        props: {
+          byTheGreatnessOfTheAlmightyAleksolotlISwearIAmWorthyOfUsingTheLegacyBaseTemplate: true,
+        },
       },
       {
         path: "lessons/",
@@ -68,21 +92,33 @@ export default
           icon: "mdi-calendar-outline",
           permission: "chronos.view_lessons_day_rule",
         },
+        props: {
+          byTheGreatnessOfTheAlmightyAleksolotlISwearIAmWorthyOfUsingTheLegacyBaseTemplate: true,
+        },
       },
       {
         path: "lessons/:year/:month/:day/",
         component: () => import("aleksis.core/components/LegacyBaseTemplate.vue"),
         name: "chronos.lessonsDayByDate",
+        props: {
+          byTheGreatnessOfTheAlmightyAleksolotlISwearIAmWorthyOfUsingTheLegacyBaseTemplate: true,
+        },
       },
       {
         path: "lessons/:id_/:week/substitution/",
         component: () => import("aleksis.core/components/LegacyBaseTemplate.vue"),
         name: "chronos.editSubstitution",
+        props: {
+          byTheGreatnessOfTheAlmightyAleksolotlISwearIAmWorthyOfUsingTheLegacyBaseTemplate: true,
+        },
       },
       {
         path: "lessons/:id_/:week/substitution/delete/",
         component: () => import("aleksis.core/components/LegacyBaseTemplate.vue"),
         name: "chronos.deleteSubstitution",
+        props: {
+          byTheGreatnessOfTheAlmightyAleksolotlISwearIAmWorthyOfUsingTheLegacyBaseTemplate: true,
+        },
       },
       {
         path: "substitutions/",
@@ -94,21 +130,33 @@ export default
           icon: "mdi-update",
           permission: "chronos.view_substitutions_rule",
         },
+        props: {
+          byTheGreatnessOfTheAlmightyAleksolotlISwearIAmWorthyOfUsingTheLegacyBaseTemplate: true,
+        },
       },
       {
         path: "substitutions/print/",
         component: () => import("aleksis.core/components/LegacyBaseTemplate.vue"),
         name: "chronos.substitutionsPrint",
+        props: {
+          byTheGreatnessOfTheAlmightyAleksolotlISwearIAmWorthyOfUsingTheLegacyBaseTemplate: true,
+        },
       },
       {
         path: "substitutions/:year/:month/:day/",
         component: () => import("aleksis.core/components/LegacyBaseTemplate.vue"),
         name: "chronos.substitutionsByDate",
+        props: {
+          byTheGreatnessOfTheAlmightyAleksolotlISwearIAmWorthyOfUsingTheLegacyBaseTemplate: true,
+        },
       },
       {
         path: "substitutions/:year/:month/:day/print/",
         component: () => import("aleksis.core/components/LegacyBaseTemplate.vue"),
         name: "chronos.substitutionsPrintByDate",
+        props: {
+          byTheGreatnessOfTheAlmightyAleksolotlISwearIAmWorthyOfUsingTheLegacyBaseTemplate: true,
+        },
       },
       {
         path: "supervisions/",
@@ -120,21 +168,33 @@ export default
           icon: "mdi-calendar-outline",
           permission: "chronos.view_supervisions_day_rule",
         },
+        props: {
+          byTheGreatnessOfTheAlmightyAleksolotlISwearIAmWorthyOfUsingTheLegacyBaseTemplate: true,
+        },
       },
       {
         path: "supervisions/:year/:month/:day/",
         component: () => import("aleksis.core/components/LegacyBaseTemplate.vue"),
         name: "chronos.supervisionsDayByDate",
+        props: {
+          byTheGreatnessOfTheAlmightyAleksolotlISwearIAmWorthyOfUsingTheLegacyBaseTemplate: true,
+        },
       },
       {
         path: "supervisions/:id_/:week/substitution/",
         component: () => import("aleksis.core/components/LegacyBaseTemplate.vue"),
         name: "chronos.editSupervisionSubstitution",
+        props: {
+          byTheGreatnessOfTheAlmightyAleksolotlISwearIAmWorthyOfUsingTheLegacyBaseTemplate: true,
+        },
       },
       {
         path: "supervisions/:id_/:week/substitution/delete/",
         component: () => import("aleksis.core/components/LegacyBaseTemplate.vue"),
         name: "chronos.deleteSupervisionSubstitution",
+        props: {
+          byTheGreatnessOfTheAlmightyAleksolotlISwearIAmWorthyOfUsingTheLegacyBaseTemplate: true,
+        },
       },
     ],
-  }
\ No newline at end of file
+  }

aleksis/apps/chronos/templates/search/indexes/chronos/room_text.txt

-{{ object.name }}
-{{ object.short_name }}

aleksis/apps/chronos/util/chronos_helpers.py

@@ -152,7 +152,7 @@ def get_rooms(user: "User"):
         wanted_rooms = set()
 
         for room in rooms:
-            if checker.has_perm("chronos.view_room_timetable", room):
+            if checker.has_perm("core.view_room_timetable", room):
                 wanted_rooms.add(room.pk)
 
         rooms = rooms.filter(Q(pk__in=wanted_rooms))

aleksis/apps/chronos/util/predicates.py

@@ -68,7 +68,7 @@ def has_room_timetable_perm(user: User, obj: Room) -> bool:
     to access the requested room timetable.
     """
     return has_global_perm("chronos.view_all_room_timetables")(user) or has_object_perm(
-        "chronos.view_room_timetable"
+        "core.view_room_timetable"
     )(user, obj)
 
 

docs/conf.py

@@ -29,9 +29,9 @@ copyright = "2018-2022 The AlekSIS team"
 author = "The AlekSIS Team"
 
 # The short X.Y version
-version = "2.5"
+version = "3.0"
 # The full version, including alpha/beta/rc tags
-release = "2.5.1.dev0"
+release = "3.0.dev1"
 
 
 # -- General configuration ---------------------------------------------------

pyproject.toml

 [tool.poetry]
 name = "AlekSIS-App-Chronos"
-version = "2.5.1.dev0"
+version = "3.0.dev1"
 packages = [
     { include = "aleksis" }
 ]
@@ -50,7 +50,7 @@ secondary = true
 [tool.poetry.dependencies]
 python = "^3.9"
 calendarweek = "^0.5.0"
-aleksis-core = "^3.0.dev"
+aleksis-core = "^3.0.dev3"
 aleksis-app-resint = "^3.0.dev"
 
 [tool.poetry.dev-dependencies]