expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2025-12-16 05:17:34 +00:00
Code Issues 18 Projects 3 Activity

enhancing list of wallets on cave description page

Browse Source
This commit is contained in:
Philip Sargent
2023-12-23 18:37:20 +00:00
parent ebfab4da45
commit 96b034d026
5 changed files with 40 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/models/wallets.py
View File

@@ -11,7 +11,7 @@ from django.db import models
from django.urls import reverse
from troggle.core.models.troggle import DataIssue
from troggle.core.views.caves import get_cave_leniently
from troggle.core.models.caves import get_cave_leniently
# from troggle.core.models.survex import SurvexBlock
# from troggle.core.models.troggle import DataIssue # circular import. Hmm
@@ -133,6 +133,9 @@ class Wallet(models.Model):
# we do not use URL_ROOT any more.
return reverse("singlewallet", kwargs={"path": re.sub("#", "%23", self.walletname)})
def get_url(self):
return f"/walletedit/{self.walletname}".replace('#', ':')
def get_json(self):
"""Read the JSON file for the wallet and do stuff
Do it every time it is queried, to be sure the result is fresh.. well, no.
@@ -150,7 +153,7 @@ class Wallet(models.Model):
fp = Path(self.fpath)
wname = fp.name
wyear = fp.parent.name
wurl = f"/walletedit/{self.walletname}".replace('#', ':')
wurl = self.get_url()
if len(wyear) != 4 or len(wname) !=6:
# no contents.json for old-style wallets