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

Fix scanned walletindex pages

Browse Source
This commit is contained in:
Philip Sargent
2022-03-18 12:26:32 +00:00
parent af7fc8f243
commit 8b889ade5f
5 changed files with 50 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/views/uploads.py
View File

@@ -26,7 +26,7 @@ from troggle.core.models.troggle import DataIssue
from troggle.core.models.troggle import Expedition, Person, PersonExpedition
from troggle.core.models.caves import LogbookEntry, QM, Cave, PersonTrip
from troggle.core.models.survex import DrawingFile
from troggle.core.views.scans import oldwallet
from troggle.core.views.scans import oldwallet, walletindex
from .auth import login_required_if_public
#from django.views.decorators.csrf import ensure_csrf_cookie, csrf_exempt
@@ -111,8 +111,12 @@ def scanupload(request, path=None):
year = wallet[:4]
if int(year) <= 1999:
print(f'! - FORM scanupload - start {wallet} REDIRECT TO OLDWALLET')
#print(f'! - FORM scanupload - start {wallet} REDIRECT TO OLDWALLET')
return(oldwallet(request, path))
if str(wallet).lower().endswith('indexpages'):
print(f'! - FORM scanupload - start {wallet} REDIRECT TO OLDWALLET')
return(walletindex(request, path))
if not re.match('(19|20)\d\d[:#]\d\d', wallet):
wallet = "2022:01" # improve this later