forked from expo/troggle
ruf cleanup imports, bigly.
This commit is contained in:
@@ -1,28 +1,15 @@
|
||||
import datetime
|
||||
import os.path
|
||||
import re
|
||||
import time
|
||||
|
||||
import django.db.models
|
||||
from django.db.models import Max, Min
|
||||
from django.http import HttpResponse, HttpResponseRedirect
|
||||
from django.shortcuts import render
|
||||
from django.template import Context, loader
|
||||
from django.template.defaultfilters import slugify
|
||||
from django.urls import reverse
|
||||
from django.utils import timezone
|
||||
from django.views.generic.list import ListView
|
||||
|
||||
import troggle.settings as settings
|
||||
from troggle.core.models.logbooks import LogbookEntry, PersonLogEntry
|
||||
from troggle.core.models.survex import SurvexBlock
|
||||
from troggle.core.models.troggle import Expedition, Person, PersonExpedition
|
||||
from troggle.core.models.troggle import Expedition, Person
|
||||
from troggle.core.models.wallets import Wallet
|
||||
from troggle.core.utils import TROG
|
||||
from troggle.parsers.imports import import_logbook
|
||||
from troggle.parsers.people import GetPersonExpeditionNameLookup
|
||||
|
||||
from .auth import login_required_if_public
|
||||
|
||||
"""These views are for logbook items when they appear in an 'expedition' page
|
||||
and for persons: their individual pages and their perseonexpedition pages.
|
||||
@@ -78,7 +65,7 @@ def expedition(request, expeditionname):
|
||||
expo = Expedition.objects.get(year=int(expeditionname))
|
||||
except:
|
||||
message = (
|
||||
f"Expedition not found - database apparently empty, you probably need to do a full re-import of all data."
|
||||
"Expedition not found - database apparently empty, you probably need to do a full re-import of all data."
|
||||
)
|
||||
return render(request, "errors/generic.html", {"message": message})
|
||||
|
||||
@@ -92,7 +79,7 @@ def expedition(request, expeditionname):
|
||||
|
||||
ts = TROG["pagecache"]["expedition"] # not much use unless single user!
|
||||
if settings.CACHEDPAGES:
|
||||
nexpos = len(TROG["pagecache"]["expedition"])
|
||||
len(TROG["pagecache"]["expedition"])
|
||||
# print(f'! - expo {expeditionname} CACHEDPAGES {nexpos} expo pages in cache.')
|
||||
if expeditionname in ts:
|
||||
# print('! - expo {expeditionanme} using cached page')
|
||||
|
||||
Reference in New Issue
Block a user