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

bugfixes

Browse Source
This commit is contained in:
Philip Sargent 2021-04-27 14:51:04 +01:00
parent 81d58f1275
commit 13f3057185
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/models/caves.py
View File

@ -171,7 +171,8 @@ class Cave(TroggleModel):
rs = [] rs = []
res = "" res = ""
for e in CaveAndEntrance.objects.filter(cave=self): for e in CaveAndEntrance.objects.filter(cave=self):
rs.append(e.entrance_letter) if e.entrance_letter:
rs.append(e.entrance_letter)
rs.sort() rs.sort()
prevR = '' prevR = ''
n = 0 n = 0

2
parsers/caves.py
View File

@ -90,7 +90,7 @@ def do_pending_cave(k, url, area_1623):
default_note += f"<br><br>\n\n - " default_note += f"<br><br>\n\n - "
default_note += f"When you Submit it will create a file file in expoweb/cave_data/ " default_note += f"When you Submit it will create a file file in expoweb/cave_data/ "
default_note += f"<br><br>\n\n - Now you can edit the entrance info: click on Edit below for the dummy entrance. " default_note += f"<br><br>\n\n - Now you can edit the entrance info: click on Edit below for the dummy entrance. "
default_note += f"and then Submit to save it. NB your entrance info will not be visible after a reboot of the server until a programmer has edited parser/caves.py (python code) to remove the cave form the [pending] list. But it won't be lost." default_note += f"and then Submit to save it (if you forget to do this, a dummy entrance will be created for your new cave description)."
slug = "1623-" + k slug = "1623-" + k

1
urls.py
View File

@ -113,7 +113,6 @@ trogglepatterns = [
re_path(r'^cave/entrance/([^/]+)/?$', caves.caveEntrance), re_path(r'^cave/entrance/([^/]+)/?$', caves.caveEntrance),
re_path(r'^cave/description/([^/]+)/?$', caves.caveDescription), re_path(r'^cave/description/([^/]+)/?$', caves.caveDescription),
re_path(r'^cave/logbook/([^/]+)/?$', caves.caveLogbook),
re_path(r'^(?P<karea>\d\d\d\d)(?P<subpath>.*)$', cavepage, name="cavepage"), # shorthand /1623/264 BUT url links may break re_path(r'^(?P<karea>\d\d\d\d)(?P<subpath>.*)$', cavepage, name="cavepage"), # shorthand /1623/264 BUT url links may break
# Note that urls eg '1623/161/l/rl89a.htm' are handled by cavepage which redirects them to 'expopage' # Note that urls eg '1623/161/l/rl89a.htm' are handled by cavepage which redirects them to 'expopage'