From 6ec7071ffc34b6932b86f7c9a821159f5f77db08 Mon Sep 17 00:00:00 2001
From: Philip Sargent <philip.sargent@klebos.com>
Date: Mon, 18 Jul 2022 19:19:06 +0300
Subject: [PATCH] Fix display of expoyear
---
core/models/caves.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/core/models/caves.py b/core/models/caves.py
index f0cba32..043773b 100644
--- a/core/models/caves.py
+++ b/core/models/caves.py
@@ -482,13 +482,14 @@ class QM(TroggleModel):
else:
cavestr = ""
if self.expoyear:
- expoyearstr = str(self.cave.slug())[5:]
+ expoyearstr = str(self.expoyear)
else:
- expoyearstr = self.expoyear
+ expoyearstr = str(self.cave.slug())[5:9]
if self.blockname:
- blocknamestr = self.blockname
+ blocknamestr = str(self.blockname)
else:
blocknamestr = ""
+ #return f'{self.cave.slug()[5:]}-{self.expoyear}-{self.blockname}{self.number}{self.grade}'
return f'{cavestr}-{expoyearstr}-{blocknamestr}{self.number}{self.grade}'
def newslug(self):