summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorPhilip Sargent <philip.sargent@klebos.com>2022-08-06 22:23:39 +0300
committerPhilip Sargent <philip.sargent@klebos.com>2022-08-06 22:23:39 +0300
commitf33c6cc0570fc409f2928b5cbda2f79dbcf0b99f (patch)
tree6488c1d620e768da7443e4ec93f07bd23a0416e1 /core
parent186eb20fb30b387f006791577519dd2734a10b3f (diff)
downloadtroggle-f33c6cc0570fc409f2928b5cbda2f79dbcf0b99f.tar.gz
troggle-f33c6cc0570fc409f2928b5cbda2f79dbcf0b99f.tar.bz2
troggle-f33c6cc0570fc409f2928b5cbda2f79dbcf0b99f.zip
bugfix in new wallet
Diffstat (limited to 'core')
-rw-r--r--core/models/survex.py4
-rw-r--r--core/views/uploads.py4
2 files changed, 5 insertions, 3 deletions
diff --git a/core/models/survex.py b/core/models/survex.py
index de65611..7e6358c 100644
--- a/core/models/survex.py
+++ b/core/models/survex.py
@@ -254,9 +254,11 @@ class Wallet(models.Model):
def get_ticks(self):
+ ticks = {}
waldata = self.get_json()
if not waldata:
- return {}
+ ticks["W"] = "black"
+ return ticks
ticks = {}
# Initially, are there any required survex files present ?
diff --git a/core/views/uploads.py b/core/views/uploads.py
index a8908d0..e46ddba 100644
--- a/core/views/uploads.py
+++ b/core/views/uploads.py
@@ -248,8 +248,8 @@ def scanupload(request, path=None):
wurl = f"/scanupload/{wallet}".replace('#', ':')
wallet = wallet.replace(':','#')
dirpath = Path(settings.SCANS_ROOT, year, wallet)
- contents_path = dirpath / contentsjson
- walletdata = dirpath / contentsjson
+ #contents_path = dirpath / contentsjson
+ contents_path = Path(settings.DRAWINGS_DATA, "walletjson") / year / wallet / contentsjson
form = FilesForm()