diff options
author | Sam Wenham <sam@wenhams.co.uk> | 2018-04-15 16:28:13 +0100 |
---|---|---|
committer | Sam Wenham <sam@wenhams.co.uk> | 2018-04-15 16:28:13 +0100 |
commit | 758259be4d63e2a3cf6e82e4a579ae836b36b931 (patch) | |
tree | 312e4a5dce84b3435c8ffa1799c38bd6bc4be2cc /core/models.py | |
parent | 2c2c815b25a12adec18e424b288f6f5e3cda1226 (diff) | |
download | troggle-758259be4d63e2a3cf6e82e4a579ae836b36b931.tar.gz troggle-758259be4d63e2a3cf6e82e4a579ae836b36b931.tar.bz2 troggle-758259be4d63e2a3cf6e82e4a579ae836b36b931.zip |
Django 1.7 mostly working. Big refactor so probably bugs
Diffstat (limited to 'core/models.py')
-rw-r--r-- | core/models.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/models.py b/core/models.py index 22b8ea4..28efaac 100644 --- a/core/models.py +++ b/core/models.py @@ -15,7 +15,7 @@ from django.template import Context, loader import settings getcontext().prec=2 #use 2 significant figures for decimal calculations -from models_survex import * +from troggle.core.models_survex import * def get_related_by_wikilinks(wiki_text): @@ -55,7 +55,7 @@ class TroggleModel(models.Model): return urlparse.urljoin(settings.URL_ROOT, "/admin/core/" + self.object_name().lower() + "/" + str(self.pk)) class Meta: - abstract = True + abstract = True class TroggleImageModel(ImageModel): new_since_parsing = models.BooleanField(default=False, editable=False) @@ -68,7 +68,7 @@ class TroggleImageModel(ImageModel): class Meta: - abstract = True + abstract = True # # single Expedition, usually seen by year @@ -140,7 +140,7 @@ class Person(TroggleModel): return urlparse.urljoin(settings.URL_ROOT,reverse('person',kwargs={'first_name':self.first_name,'last_name':self.last_name})) class Meta: - verbose_name_plural = "People" + verbose_name_plural = "People" class Meta: ordering = ('orderref',) # "Wookey" makes too complex for: ('last_name', 'first_name') |