mirror of
https://expo.survex.com/repositories/troggle/.git
synced 2025-12-17 09:47:24 +00:00
enhancing list of wallets on cave description page
This commit is contained in:
@@ -15,8 +15,9 @@ from django.urls import NoReverseMatch, reverse
|
||||
|
||||
import troggle.settings as settings
|
||||
from troggle.core.forms import CaveAndEntranceFormSet, CaveForm, EntranceForm, EntranceLetterForm
|
||||
from troggle.core.models.caves import Cave, CaveAndEntrance, Entrance, GetCaveLookup
|
||||
from troggle.core.models.caves import Cave, CaveAndEntrance, Entrance, GetCaveLookup, get_cave_leniently
|
||||
from troggle.core.models.logbooks import CaveSlug, QM
|
||||
from troggle.core.models.wallets import Wallet
|
||||
from troggle.core.utils import write_and_commit
|
||||
from troggle.core.views import expo
|
||||
from troggle.settings import CAVEDESCRIPTIONS, ENTRANCEDESCRIPTIONS
|
||||
@@ -40,19 +41,7 @@ todo = """
|
||||
https://zerotobyte.com/how-to-use-django-select-related-and-prefetch-related/
|
||||
"""
|
||||
|
||||
def get_cave_leniently(caveid):
|
||||
try:
|
||||
c = getCave(caveid)
|
||||
if c:
|
||||
return c
|
||||
except:
|
||||
# print(f"get_cave_leniently FAIL {caveid}")
|
||||
try:
|
||||
c = getCave("1623-"+caveid)
|
||||
if c:
|
||||
return c
|
||||
except:
|
||||
return None
|
||||
|
||||
|
||||
|
||||
def getCaves(cave_id):
|
||||
@@ -294,6 +283,8 @@ def rendercave(request, cave, slug, cave_id=""):
|
||||
# see design docum in troggle/templates/cave.html
|
||||
# see rendercave() in troggle/core/views/caves.py
|
||||
templatefile = "cave.html"
|
||||
|
||||
wallets = Wallet.objects.filter(caves=cave)
|
||||
|
||||
if not cave_id:
|
||||
cave_id = slug # cave.unofficial_number
|
||||
@@ -305,6 +296,7 @@ def rendercave(request, cave, slug, cave_id=""):
|
||||
"cave_id": cave_id,
|
||||
"svxstem": str(svxstem),
|
||||
"svx3d": svx3d,
|
||||
"wallets": wallets,
|
||||
}
|
||||
|
||||
# Do not catch any exceptions here: propagate up to caller
|
||||
|
||||
Reference in New Issue
Block a user