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

Imposrt mad more specific

Browse Source
This commit is contained in:
Philip Sargent
2020-05-30 12:35:15 +01:00
parent d857cc9084
commit 01e098339e
3 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/models_caves.py
View File

@@ -19,7 +19,7 @@ from django.core.urlresolvers import reverse
from django.template import Context, loader
from troggle.core.models import TroggleModel, TroggleImageModel, Person, Expedition
from troggle.core.models_survex import *
from troggle.core.models_survex import SurvexStation
class Area(TroggleModel):
short_name = models.CharField(max_length=100)
@@ -444,7 +444,7 @@ class LogbookEntry(TroggleModel):
def __init__(self, *args, **kwargs):
if "cave" in list(kwargs.keys()):
if kwargs["cave"] is not None:
kwargs["cave_slug"] = models_caves.CaveSlug.objects.get(cave=kwargs["cave"], primary=True).slug
kwargs["cave_slug"] = CaveSlug.objects.get(cave=kwargs["cave"], primary=True).slug
kwargs.pop("cave")
# parse error in python3.8
return TroggleModel.__init__(self, *args, **kwargs) # seems OK in 3.5 & 3.8! failure later elsewhere with 3.8