Merge branch 'master' into training

# Conflicts: # templates/base.html
2026-01-22 16:02:16 +00:00 · 2021-12-21 19:53:13 +00:00
parent f4f2fbdc03 708a387774
commit 0d9bf89180
16 changed files with 1229 additions and 11206 deletions
--- a/RIGS/models.py
+++ b/RIGS/models.py
@@ -347,10 +347,13 @@ class Event(models.Model, RevisionMixin):

    @property
    def display_id(self):
-        if self.is_rig:
-            return str("N%05d" % self.pk)
+        if self.pk:
+            if self.is_rig:
+                return str("N%05d" % self.pk)
+            else:
+                return self.pk
        else:
-            return self.pk
+            return "????"

    # Calculated values
    """