forked from expo/troggle
Removing foissil: subcave and flatpages-redirects
This commit is contained in:
@@ -59,7 +59,7 @@ class SimpleTest(SimpleTestCase):
|
||||
def test_import_parses_mix(self):
|
||||
from troggle.parsers.logbooks import GetCaveLookup
|
||||
import troggle.settings
|
||||
import troggle.flatpages.models
|
||||
#import troggle.flatpages.models
|
||||
import troggle.logbooksdump
|
||||
import troggle.parsers.caves
|
||||
import troggle.parsers.people
|
||||
|
||||
@@ -141,10 +141,11 @@ class SurvexBlock(models.Model):
|
||||
def DayIndex(self):
|
||||
return list(self.expeditionday.survexblock_set.all()).index(self)
|
||||
|
||||
class SurvexTitle(models.Model):
|
||||
survexblock = models.ForeignKey('SurvexBlock',null=True, on_delete=models.SET_NULL)
|
||||
title = models.CharField(max_length=200) # needed by svxcavesingle.html template
|
||||
cave = models.ForeignKey('Cave', blank=True, null=True,on_delete=models.SET_NULL)
|
||||
# Fossil. No code uses this.
|
||||
# class SurvexTitle(models.Model):
|
||||
# survexblock = models.ForeignKey('SurvexBlock',null=True, on_delete=models.SET_NULL)
|
||||
# title = models.CharField(max_length=200) # needed by svxcavesingle.html template
|
||||
# cave = models.ForeignKey('Cave', blank=True, null=True,on_delete=models.SET_NULL)
|
||||
|
||||
#
|
||||
# member of a SurvexBlock
|
||||
|
||||
@@ -14,7 +14,7 @@ from django.http import HttpResponse, Http404
|
||||
import troggle.settings as settings
|
||||
import parsers.survex
|
||||
from troggle.core.models import Expedition, Person, PersonExpedition
|
||||
from troggle.core.models_survex import SurvexBlock, SurvexPersonRole, SurvexFile, SurvexDirectory #, SurvexTitle
|
||||
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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user