summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorPhilip Sargent <philip.sargent@klebos.com>2022-07-18 19:19:06 +0300
committerPhilip Sargent <philip.sargent@klebos.com>2022-07-18 19:19:06 +0300
commit6ec7071ffc34b6932b86f7c9a821159f5f77db08 (patch)
tree4205022ef6b98221228e900e7b3e3c42211da9b2 /core
parent4efeefe6c9205f6c0678619307253f4b82d8a8c6 (diff)
downloadtroggle-6ec7071ffc34b6932b86f7c9a821159f5f77db08.tar.gz
troggle-6ec7071ffc34b6932b86f7c9a821159f5f77db08.tar.bz2
troggle-6ec7071ffc34b6932b86f7c9a821159f5f77db08.zip
Fix display of expoyear
Diffstat (limited to 'core')
-rw-r--r--core/models/caves.py7
1 files 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):