diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/admin.py | 3 | ||||
| -rw-r--r-- | core/models_caves.py | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/core/admin.py b/core/admin.py index 3bc14d4..2f07cba 100644 --- a/core/admin.py +++ b/core/admin.py @@ -6,7 +6,8 @@ from django.core import serializers from troggle.core.views_other import downloadLogbook from troggle.core.models import * -from troggle.core.models_caves import * +from troggle.core.models_caves import Cave, Area, Entrance, CaveAndEntrance, NewSubCave, OtherCaveName, CaveDescription, LogbookEntry, PersonTrip, Survey, ScannedImage, QM +from troggle.core.models_survex import SurvexBlock, SurvexPersonRole, SurvexStation, SurvexScansFolder, SurvexScanSingle #from troggle.reversion.admin import VersionAdmin #django-reversion version control diff --git a/core/models_caves.py b/core/models_caves.py index 44a5ac7..b3520b7 100644 --- a/core/models_caves.py +++ b/core/models_caves.py @@ -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 |