Merge branch 'master' into...

Merge branch 'master' into 139-lesson-topic-not-carried-to-previous-lesson-if-entered-in-second-lesson-of-a-block

aleksis/apps/alsijil/migrations/0008_global_permissions.py

@@ -17,6 +17,7 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('extended_data', models.JSONField(default=dict, editable=False)),
             ],
+            "default_permissions": (),
             options={
                 'permissions': (('view_week', 'Can view week overview'), ('register_absence', 'Can register absence'), ('list_personal_note_filters', 'Can list all personal note filters')),
                 'managed': False,

aleksis/apps/alsijil/models.py

@@ -31,7 +31,7 @@ from aleksis.apps.alsijil.managers import (
 from aleksis.apps.chronos.managers import GroupPropertiesMixin
 from aleksis.apps.chronos.mixins import WeekRelatedMixin
 from aleksis.apps.chronos.models import Event, ExtraLesson, LessonPeriod
-from aleksis.core.mixins import ExtensibleModel
+from aleksis.core.mixins import ExtensibleModel, GlobalPermissionModel
 from aleksis.core.models import SchoolTerm
 from aleksis.core.util.core_helpers import get_site_preferences
 from aleksis.core.util.model_helpers import ICONS
@@ -447,7 +447,7 @@ class GroupRoleAssignment(GroupPropertiesMixin, ExtensibleModel):
         verbose_name_plural = _("Group role assignments")
 
 
-class AlsijilGlobalPermissions(ExtensibleModel):
+class AlsijilGlobalPermissions(GlobalPermissionModel):
     class Meta:
         managed = False
         permissions = (

aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html

@@ -114,11 +114,13 @@
                 <a href="#personal-notes">{% trans "Personal notes" %}</a>
               </li>
             {% endif %}
-            {% has_perm "alsijil.view_lessondocumentation" user register_object.prev as can_view_prev_lesson_documentation %}
-            {% if register_object.prev.get_lesson_documentation and can_view_prev_lesson_documentation %}
-              <li class="tab">
-                <a href="#previous-lesson">{% trans "Previous lesson" %}</a>
-              </li>
+            {% if prev_lesson %}
+              {% has_perm "alsijil.view_lessondocumentation" user prev_lesson as can_view_prev_lesson_documentation %}
+              {% if prev_lesson.get_lesson_documentation and can_view_prev_lesson_documentation %}
+                <li class="tab">
+                  <a href="#previous-lesson">{% trans "Previous lesson" %}</a>
+                </li>
+              {% endif %}
             {% endif %}
             {% if group_roles %}
               <li class="tab">
@@ -172,7 +174,7 @@
           </div>
         </div>
 
-        {% with prev_lesson=register_object.prev prev_doc=prev_lesson.get_lesson_documentation %}
+        {% with prev_doc=prev_lesson.get_lesson_documentation %}
           {% with absences=prev_lesson.get_absences tardinesses=prev_lesson.get_tardinesses extra_marks=prev_lesson.get_extra_marks %}
             {% has_perm "alsijil.view_lessondocumentation" user prev_lesson as can_view_prev_lesson_documentation %}
             {% if prev_doc and can_view_prev_lesson_documentation %}

aleksis/apps/alsijil/util/alsijil_helpers.py

@@ -210,11 +210,7 @@ def _generate_dicts_for_lesson_periods(
                 ):
                     continue
 
-                teachers = (
-                    sub.teacher_names
-                    if sub and sub.teachers.all()
-                    else lesson_period.lesson.teacher_names
-                )
+                teachers = lesson_period.teacher_names
                 if (
                     filter_dict.get("subject")
                     and filter_dict.get("subject") != lesson_period.get_subject()