diff options
Diffstat (limited to 'core/views')
| -rw-r--r-- | core/views/caves.py | 2 | ||||
| -rw-r--r-- | core/views/logbooks.py | 2 | ||||
| -rw-r--r-- | core/views/other.py | 2 | ||||
| -rw-r--r-- | core/views/statistics.py | 2 | ||||
| -rw-r--r-- | core/views/survex.py | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/core/views/caves.py b/core/views/caves.py index e3b114d..8c02ea2 100644 --- a/core/views/caves.py +++ b/core/views/caves.py @@ -17,7 +17,7 @@ from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned import troggle.settings as settings #import troggle.core.models as models from troggle.core.views import expo -from troggle.core.models import Expedition, DataIssue +from troggle.core.models.troggle import Expedition, DataIssue from troggle.core.models_caves import CaveSlug, Cave, CaveAndEntrance, QM, EntranceSlug, Entrance, Area, SurvexStation, GetCaveLookup from troggle.core.forms import CaveForm, CaveAndEntranceFormSet, VersionControlCommentForm, EntranceForm, EntranceLetterForm from .login import login_required_if_public diff --git a/core/views/logbooks.py b/core/views/logbooks.py index 1db2edc..f74c21f 100644 --- a/core/views/logbooks.py +++ b/core/views/logbooks.py @@ -14,7 +14,7 @@ from django.views.generic.list import ListView #import troggle.parsers.logbooks as logbookparsers from troggle.core.forms import getTripForm # , get_name, PersonForm -from troggle.core.models import Expedition, Person, PersonExpedition +from troggle.core.models.troggle import Expedition, Person, PersonExpedition from troggle.core.utils import TROG from troggle.core.models_caves import LogbookEntry, PersonTrip from troggle.core.models_survex import SurvexBlock diff --git a/core/views/other.py b/core/views/other.py index d65f3e6..30b3093 100644 --- a/core/views/other.py +++ b/core/views/other.py @@ -9,7 +9,7 @@ from django.shortcuts import render from django.template import Context, loader import troggle.parsers.imports -from troggle.core.models import Expedition, Person, PersonExpedition +from troggle.core.models.troggle import Expedition, Person, PersonExpedition from troggle.core.models_caves import LogbookEntry, QM, Cave, PersonTrip from .login import login_required_if_public from troggle.core.forms import UploadFileForm diff --git a/core/views/statistics.py b/core/views/statistics.py index ac1e7ac..9c45f9f 100644 --- a/core/views/statistics.py +++ b/core/views/statistics.py @@ -11,7 +11,7 @@ from django.template.defaultfilters import slugify from django.utils import timezone #from django.views.generic.list import ListView -from troggle.core.models import Expedition, Person, PersonExpedition, DataIssue +from troggle.core.models.troggle import Expedition, Person, PersonExpedition, DataIssue from troggle.core.models_caves import Cave, LogbookEntry from troggle.core.models_survex import SurvexBlock diff --git a/core/views/survex.py b/core/views/survex.py index 0818e0c..3aee5f8 100644 --- a/core/views/survex.py +++ b/core/views/survex.py @@ -14,7 +14,7 @@ from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned import troggle.settings as settings import parsers.survex -from troggle.core.models import Expedition, Person, PersonExpedition +from troggle.core.models.troggle import Expedition, Person, PersonExpedition from troggle.core.models_survex import SurvexBlock, SurvexPersonRole, SurvexFile, SurvexDirectory from troggle.core.models_caves import Cave, PersonTrip, LogbookEntry from troggle.parsers.people import GetPersonExpeditionNameLookup |