Skip to content
Snippets Groups Projects
Verified Commit 62fe64b3 authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Fix inclusion of group roles with events and extra lessons after merge

parent 7c1387cf
No related branches found
No related tags found
1 merge request!120Resolve "Support events and extra lessons in class register"
...@@ -366,7 +366,7 @@ ...@@ -366,7 +366,7 @@
{% if group_roles %} {% if group_roles %}
<div class="col s12" id="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> </div>
{% endif %} {% endif %}
......
...@@ -147,7 +147,7 @@ def register_object( ...@@ -147,7 +147,7 @@ def register_object(
else None else None
) )
back_url = reverse( 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 context["back_url"] = back_url
...@@ -167,9 +167,9 @@ def register_object( ...@@ -167,9 +167,9 @@ def register_object(
# Group roles # Group roles
show_group_roles = request.user.person.preferences[ show_group_roles = request.user.person.preferences[
"alsijil__group_roles_in_lesson_view" "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: 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) group_roles = GroupRole.objects.with_assignments(date_of_lesson, groups)
context["group_roles"] = group_roles context["group_roles"] = group_roles
......
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