From faea9f80ae4d81e4eac3b15c160512db2e4ce733 Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Mon, 2 Apr 2018 21:21:04 +0200
Subject: [PATCH] New damn reportnr

---
 submissions/models.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/submissions/models.py b/submissions/models.py
index 5936bd4ca..7152bbec3 100644
--- a/submissions/models.py
+++ b/submissions/models.py
@@ -501,8 +501,13 @@ class Report(SubmissionRelatedObjectMixin, models.Model):
     def save(self, *args, **kwargs):
         """Update report number before saving on creation."""
         if not self.report_nr:
-            self.report_nr = self.submission.reports.aggregate(
-                models.Max('report_nr')).get('report_nr__max', 0) + 1
+            new_report_nr = self.submission.reports.aggregate(
+                models.Max('report_nr')).get('report_nr__max')
+            if new_report_nr:
+                new_report_nr += 1
+            else:
+                new_report_nr = 1
+            self.report_nr = new_report_nr
         return super().save(*args, **kwargs)
 
     def get_absolute_url(self):
-- 
GitLab