From 62fe64b3d03364c4f91ea9c05d21e2192e01dd9d Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Wed, 24 Feb 2021 11:16:04 +0100
Subject: [PATCH] Fix inclusion of group roles with events and extra lessons
after merge
---
.../alsijil/templates/alsijil/class_register/lesson.html | 2 +-
aleksis/apps/alsijil/views.py | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html b/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
index 80ad5de27..f21d7686a 100644
--- a/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
+++ b/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
@@ -366,7 +366,7 @@
{% if group_roles %}
<div class="col s12" id="group-roles">
- {% include "alsijil/group_role/partials/assigned_roles.html" with roles=group_roles group=lesson_period.lesson.groups.first back_url=back_url %}
+ {% include "alsijil/group_role/partials/assigned_roles.html" with roles=group_roles group=register_object.get_groups.first back_url=back_url %}
</div>
{% endif %}
diff --git a/aleksis/apps/alsijil/views.py b/aleksis/apps/alsijil/views.py
index 2c13c0b27..b8d956660 100644
--- a/aleksis/apps/alsijil/views.py
+++ b/aleksis/apps/alsijil/views.py
@@ -147,7 +147,7 @@ def register_object(
else None
)
back_url = reverse(
- "lesson_by_week_and_period", args=[wanted_week.year, wanted_week.week, lesson_period.pk]
+ "lesson_period", args=[wanted_week.year, wanted_week.week, register_object.pk]
)
context["back_url"] = back_url
@@ -167,9 +167,9 @@ def register_object(
# Group roles
show_group_roles = request.user.person.preferences[
"alsijil__group_roles_in_lesson_view"
- ] and request.user.has_perm("alsijil.view_assigned_grouproles", lesson_period)
+ ] and request.user.has_perm("alsijil.view_assigned_grouproles", register_object)
if show_group_roles:
- groups = lesson_period.lesson.groups.all()
+ groups = register_object.get_groups().all()
group_roles = GroupRole.objects.with_assignments(date_of_lesson, groups)
context["group_roles"] = group_roles
--
GitLab