diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/TESTS/test_imports.py | 10 | ||||
| -rw-r--r-- | core/admin.py | 2 | ||||
| -rw-r--r-- | core/forms.py | 2 | ||||
| -rw-r--r-- | core/models/caves.py (renamed from core/models_caves.py) | 0 | ||||
| -rw-r--r-- | core/templatetags/wiki_markup.py | 2 | ||||
| -rw-r--r-- | core/views/caves.py | 2 | ||||
| -rw-r--r-- | core/views/expo.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 |
11 files changed, 14 insertions, 14 deletions
diff --git a/core/TESTS/test_imports.py b/core/TESTS/test_imports.py index 01e76c7..8c5abe3 100644 --- a/core/TESTS/test_imports.py +++ b/core/TESTS/test_imports.py @@ -29,7 +29,7 @@ class SimpleTest(SimpleTestCase): def test_import_TroggleModel(self): from troggle.core.models.troggle import TroggleModel def test_import_Cave(self): - from troggle.core.models_caves import Cave + from troggle.core.models.caves import Cave def test_import_parsers_surveys(self): from PIL import Image from troggle.core.utils import save_carefully @@ -37,12 +37,12 @@ class SimpleTest(SimpleTestCase): def test_import_parsers_survex(self): import troggle.settings as settings import troggle.core.models.troggle as models - import troggle.core.models_caves as models_caves + import troggle.core.models.caves as models_caves import troggle.core.models_survex as models_survex from troggle.parsers.people import GetPersonExpeditionNameLookup from troggle.core.views.caves import MapLocations def test_import_parsers_QMs(self): - from troggle.core.models_caves import QM, Cave, LogbookEntry + from troggle.core.models.caves import QM, Cave, LogbookEntry def test_import_parsers_people(self): from html.parser import HTMLParser from unidecode import unidecode @@ -50,14 +50,14 @@ class SimpleTest(SimpleTestCase): from django.template.defaultfilters import slugify from django.utils.timezone import get_current_timezone, make_aware from troggle.core.models.troggle import DataIssue, Expedition - from troggle.core.models_caves import Cave, LogbookEntry, PersonTrip + from troggle.core.models.caves import Cave, LogbookEntry, PersonTrip from parsers.people import GetPersonExpeditionNameLookup def test_import_core_views_caves(self): from django.http import HttpResponse, HttpResponseRedirect from django.shortcuts import get_object_or_404, render import troggle.core.views.expo from troggle.core.models.troggle import Expedition - from troggle.core.models_caves import CaveSlug, Cave, CaveAndEntrance, QM, EntranceSlug, Entrance, Area, SurvexStation + from troggle.core.models.caves import CaveSlug, Cave, CaveAndEntrance, QM, EntranceSlug, Entrance, Area, SurvexStation from troggle.core.forms import CaveForm, CaveAndEntranceFormSet, VersionControlCommentForm, EntranceForm, EntranceLetterForm from troggle.core.views.login import login_required_if_public from django.contrib.auth.decorators import login_required diff --git a/core/admin.py b/core/admin.py index 0a9015b..4adb153 100644 --- a/core/admin.py +++ b/core/admin.py @@ -6,7 +6,7 @@ from django.core import serializers from troggle.core.views.other import downloadLogbook from troggle.core.models.troggle import Person, PersonExpedition, Expedition, DataIssue -from troggle.core.models_caves import Cave, Area, Entrance, CaveAndEntrance, LogbookEntry, PersonTrip, QM +from troggle.core.models.caves import Cave, Area, Entrance, CaveAndEntrance, LogbookEntry, PersonTrip, QM from troggle.core.models_survex import SurvexBlock, SurvexPersonRole, SurvexStation, ScansFolder, SingleScan '''This code significantly adds to the capabilities of the Django Management control panel for Troggle data. diff --git a/core/forms.py b/core/forms.py index c7eb551..73d541a 100644 --- a/core/forms.py +++ b/core/forms.py @@ -9,7 +9,7 @@ from django.contrib.admin.widgets import AdminDateWidget #from tinymce.widgets import TinyMCE from troggle.core.models.troggle import Person, PersonExpedition, Expedition -from troggle.core.models_caves import Cave, LogbookEntry, QM, Entrance, CaveAndEntrance +from troggle.core.models.caves import Cave, LogbookEntry, QM, Entrance, CaveAndEntrance class CaveForm(ModelForm): underground_description = forms.CharField(required = False, widget=forms.Textarea()) diff --git a/core/models_caves.py b/core/models/caves.py index b0ecb53..b0ecb53 100644 --- a/core/models_caves.py +++ b/core/models/caves.py diff --git a/core/templatetags/wiki_markup.py b/core/templatetags/wiki_markup.py index fff2836..276586a 100644 --- a/core/templatetags/wiki_markup.py +++ b/core/templatetags/wiki_markup.py @@ -3,7 +3,7 @@ from django.utils.html import conditional_escape from django.template.defaultfilters import stringfilter from django.utils.safestring import mark_safe from django.conf import settings -from troggle.core.models_caves import LogbookEntry, QM, Cave +from troggle.core.models.caves import LogbookEntry, QM, Cave import re, urllib.parse register = template.Library() diff --git a/core/views/caves.py b/core/views/caves.py index 8c02ea2..8884d46 100644 --- a/core/views/caves.py +++ b/core/views/caves.py @@ -18,7 +18,7 @@ import troggle.settings as settings #import troggle.core.models as models from troggle.core.views import expo 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.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/expo.py b/core/views/expo.py index 0a95011..84f979c 100644 --- a/core/views/expo.py +++ b/core/views/expo.py @@ -14,7 +14,7 @@ from django.contrib import admin import django.forms as forms from .login import login_required_if_public -from troggle.core.models_caves import Cave +from troggle.core.models.caves import Cave import troggle.core.views.caves import troggle.settings as settings diff --git a/core/views/logbooks.py b/core/views/logbooks.py index f74c21f..2729135 100644 --- a/core/views/logbooks.py +++ b/core/views/logbooks.py @@ -16,7 +16,7 @@ from django.views.generic.list import ListView from troggle.core.forms import getTripForm # , get_name, PersonForm 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.caves import LogbookEntry, PersonTrip from troggle.core.models_survex import SurvexBlock from .login import login_required_if_public from troggle.parsers.logbooks import LoadLogbookForExpedition diff --git a/core/views/other.py b/core/views/other.py index 30b3093..569264b 100644 --- a/core/views/other.py +++ b/core/views/other.py @@ -10,7 +10,7 @@ from django.template import Context, loader import troggle.parsers.imports from troggle.core.models.troggle import Expedition, Person, PersonExpedition -from troggle.core.models_caves import LogbookEntry, QM, Cave, PersonTrip +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 9c45f9f..bc6bced 100644 --- a/core/views/statistics.py +++ b/core/views/statistics.py @@ -12,7 +12,7 @@ from django.utils import timezone #from django.views.generic.list import ListView from troggle.core.models.troggle import Expedition, Person, PersonExpedition, DataIssue -from troggle.core.models_caves import Cave, LogbookEntry +from troggle.core.models.caves import Cave, LogbookEntry from troggle.core.models_survex import SurvexBlock import troggle.settings as settings diff --git a/core/views/survex.py b/core/views/survex.py index 3aee5f8..46ddb88 100644 --- a/core/views/survex.py +++ b/core/views/survex.py @@ -16,7 +16,7 @@ import troggle.settings as settings import parsers.survex 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.core.models.caves import Cave, PersonTrip, LogbookEntry from troggle.parsers.people import GetPersonExpeditionNameLookup survexdatasetpath = Path(settings.SURVEX_DATA) |