Skip to content
Snippets Groups Projects
Commit 6b7a872b authored by Jakob Dieterle's avatar Jakob Dieterle
Browse files

fix merge error

parent d92611b0
1 merge request!244Resolve "Make exam a many to many field on StudentInfo model"
Pipeline #299333 passed
......@@ -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):
......
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