xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity

cope with bad wallet name

Browse Source
This commit is contained in:
Philip Sargent 2022-12-29 13:56:09 +00:00
parent 78740a1fc0
commit 9dc1853e10
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/views/uploads.py
View File

@ -676,12 +676,15 @@ def scanupload(request, path=None):
checked[f] = "checked" checked[f] = "checked"
survexsize = str(min(len(str(waldata["survex file"])), 46)) survexsize = str(min(len(str(waldata["survex file"])), 46))
thiswallet = Wallet.objects.get(walletname=wallet) try:
caveifywallet(thiswallet) thiswallet = Wallet.objects.get(walletname=wallet)
thiswallet.ticks = thiswallet.get_ticks() # the complaints in colour form caveifywallet(thiswallet)
#fixsurvextick(thiswallet, thiswallet.ticks) thiswallet.ticks = thiswallet.get_ticks() # the complaints in colour form
print(thiswallet) #fixsurvextick(thiswallet, thiswallet.ticks)
print(thiswallet)
except:
thiswallet = None
context = {'year': year, 'prev': prev, 'next': next, 'prevy': prevy, 'nexty': nexty, context = {'year': year, 'prev': prev, 'next': next, 'prevy': prevy, 'nexty': nexty,
'files': files, 'dirs': dirs, 'waldata': waldata, 'svxfiles': svxfiles, 'files': files, 'dirs': dirs, 'waldata': waldata, 'svxfiles': svxfiles,
'checked': checked, 'checked': checked,

2
templates/wallet_table.html
View File

@ -49,7 +49,7 @@
<td style="padding:1px; background-color:{{wallet.ticks.T}}" title="Tunnel or Therion done">&nbsp;</td> <td style="padding:1px; background-color:{{wallet.ticks.T}}" title="Tunnel or Therion done">&nbsp;</td>
<td style="padding:1px; background-color:{{wallet.ticks.W}}" title="Website updated">&nbsp;</td> <td style="padding:1px; background-color:{{wallet.ticks.W}}" title="Website updated">&nbsp;</td>
</tr> </tr>
{% empty %} <h2>No Wallets for this year</h2> {% empty %} <h2>No Wallet found</h2>
<b>Before 1998</b> we used a survey book system, not wallets. But 1983 has some scraps recreated as wallets. <b>Before 1998</b> we used a survey book system, not wallets. But 1983 has some scraps recreated as wallets.
<p>That is probably why you cannot see anything here. Look at the complete list of scanned files instead, <p>That is probably why you cannot see anything here. Look at the complete list of scanned files instead,
at <a href="/survey_scans/">Scans</a> (it is slow, so be patient). at <a href="/survey_scans/">Scans</a> (it is slow, so be patient).