From 672baf26ca6f9b8fba28ee75466e3db547aadb75 Mon Sep 17 00:00:00 2001
From: Hangzhi Yu <hangzhi@protonmail.com>
Date: Wed, 15 Jun 2022 01:32:54 +0200
Subject: [PATCH] Only check carry over form field if the corresponding
preference is turned on
---
CHANGELOG.rst | 1 +
aleksis/apps/alsijil/forms.py | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 7151f1d9b..e09961228 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -22,6 +22,7 @@ Fixed
* The week overview page was not refreshed when a new week was selected in the dropdown.
* Make generation of full register printout faster.
+* Updating a lesson documentation caused an error when the preference for carrying over lesson documentations to the whole week was deactivated.
`2.0.1`_ - 2022-02-12
---------------------
diff --git a/aleksis/apps/alsijil/forms.py b/aleksis/apps/alsijil/forms.py
index 6f4e65b20..e8ade98e2 100644
--- a/aleksis/apps/alsijil/forms.py
+++ b/aleksis/apps/alsijil/forms.py
@@ -58,7 +58,8 @@ class LessonDocumentationForm(forms.ModelForm):
def save(self, **kwargs):
lesson_documentation = super(LessonDocumentationForm, self).save(commit=True)
if (
- self.cleaned_data["carry_over_week"]
+ get_site_preferences()["alsijil__allow_carry_over_same_week"]
+ and self.cleaned_data["carry_over_week"]
and (
lesson_documentation.topic
or lesson_documentation.homework
--
GitLab