diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/models/troggle.py | 2 | ||||
| -rw-r--r-- | core/views/logbooks.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/core/models/troggle.py b/core/models/troggle.py index a061ee5..3be7b5c 100644 --- a/core/models/troggle.py +++ b/core/models/troggle.py @@ -85,7 +85,7 @@ class Expedition(TroggleModel): class ExpeditionDay(TroggleModel): - """Exists only on Expedition now. Removed links from logbookentry, persontrip, survex stuff etc. + """Exists only on Expedition now. Removed links from logbookentry, personlogentry, survex stuff etc. """ expedition = models.ForeignKey("Expedition",on_delete=models.CASCADE) date = models.DateField() diff --git a/core/views/logbooks.py b/core/views/logbooks.py index 4daede9..b7ad2bc 100644 --- a/core/views/logbooks.py +++ b/core/views/logbooks.py @@ -166,9 +166,9 @@ def get_person_chronology(personexpedition): Rewrite more simply with the login in the python, not in Django template language (you bastard Curtis). ''' res = { } - for persontrip in personexpedition.persontrip_set.all(): - a = res.setdefault(persontrip.logbook_entry.date, { }) - a.setdefault("personlogentries", [ ]).append(persontrip) + for personlogentry in personexpedition.personlogentry_set.all(): + a = res.setdefault(personlogentry.logbook_entry.date, { }) + a.setdefault("personlogentries", [ ]).append(personlogentry) for personrole in personexpedition.survexpersonrole_set.all(): if personrole.survexblock.date: # avoid bad data from another bug @@ -227,7 +227,7 @@ def logbookentry(request, date, slug): # svxothers = None svxothers = SurvexBlock.objects.filter(date=date) this_logbookentry=this_logbookentry[0] - # This is the only page that uses persontrip_next and persontrip_prev + # This is the only page that uses personlogentry_next and personlogentry_prev # and it is calculated on the fly in the model return render(request, 'logbookentry.html', {'logbookentry': this_logbookentry, 'trips': trips, 'svxothers': svxothers, 'wallets': wallets}) |