mirror of
https://expo.survex.com/repositories/troggle/.git
synced 2026-02-08 10:38:25 +00:00
select_related added
This commit is contained in:
@@ -89,7 +89,7 @@ def datewallet(w, earliest):
|
||||
changing the schema to allow many.
|
||||
"""
|
||||
first = earliest
|
||||
blocks = SurvexBlock.objects.filter(scanswallet=w) # only ONE I think ?!
|
||||
blocks = SurvexBlock.objects.filter(scanswallet=w).select_related("survexfile", "scanswallet")
|
||||
for b in blocks:
|
||||
if b.date:
|
||||
if b.date < first:
|
||||
@@ -152,7 +152,7 @@ def get_team_on_trip(survexblock):
|
||||
if len(trip_people_cache[survexblock]) > 0:
|
||||
return trip_people_cache[survexblock]
|
||||
|
||||
qpeople = SurvexPersonRole.objects.filter(survexblock=survexblock) # not very good Django style
|
||||
qpeople = SurvexPersonRole.objects.filter(survexblock=survexblock).select_related("person", "personexpedition")
|
||||
trip_people_cache[survexblock] = qpeople # this is a query list
|
||||
return qpeople
|
||||
|
||||
@@ -2921,7 +2921,7 @@ def set_survexblocks():
|
||||
# # print(sfile)
|
||||
# except:
|
||||
# continue
|
||||
blocks = SurvexBlock.objects.filter(survexfile=sfile)
|
||||
blocks = SurvexBlock.objects.filter(survexfile=sfile).select_related("scanswallet", "survexfile")
|
||||
for b in blocks:
|
||||
if b.date: # many are NULL, e.g. ARGE, so have no wallet
|
||||
if b.scanswallet == wallet:
|
||||
|
||||
Reference in New Issue
Block a user