From 6b7a872b0fc846e466968f87e43ad791c64b6208 Mon Sep 17 00:00:00 2001
From: "jakob.dieterle" <jakob.dieterle@stud.uni-goettingen.de>
Date: Wed, 18 May 2022 14:01:26 +0200
Subject: [PATCH] fix merge error
---
core/signals.py | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/core/signals.py b/core/signals.py
index fc561bbd..b857cb0b 100644
--- a/core/signals.py
+++ b/core/signals.py
@@ -60,22 +60,7 @@ def update_student_score(sender, instance, **kwargs):
for exam_info in student.exams.all():
exam_info.update_total_score()
log.debug('SIGNAL -- Scores of student %s were updated)', student)
-=======
- student.exams[0].update_total_score()
- log.debug('SIGNAL -- Score of student %s was updated %s)',
- student,
- student.total_score)
->>>>>>> added new many-to-many field and wrapper class
-=======
- for exam_info in student.exams.all():
- exam_info.update_total_score()
- log.debug('SIGNAL -- Scores of student %s were updated)', student)
->>>>>>> exams now manytomany field, problems resolved
- for exam_info in student.exams.all():
- exam_info.update_total_score()
- log.debug('SIGNAL -- Scores of student %s were updated)', student)
-
@receiver(pre_save, sender=FeedbackComment)
def set_comment_visibility_after_conflict(sender, instance, **kwargs):
--
GitLab