diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/admin.py | 23 | ||||
| -rw-r--r-- | core/views_logbooks.py | 1 | ||||
| -rw-r--r-- | core/views_statistics.py | 55 |
3 files changed, 27 insertions, 52 deletions
diff --git a/core/admin.py b/core/admin.py index 6b272f5..c820b77 100644 --- a/core/admin.py +++ b/core/admin.py @@ -5,10 +5,9 @@ from django.http import HttpResponse from django.core import serializers from troggle.core.views_other import downloadLogbook -from troggle.core.models import * +from troggle.core.models import Person, PersonExpedition, Expedition, DataIssue from troggle.core.models_caves import Cave, Area, Entrance, CaveAndEntrance, NewSubCave, OtherCaveName, CaveDescription, LogbookEntry, PersonTrip, QM from troggle.core.models_survex import SurvexBlock, SurvexPersonRole, SurvexStation, SurvexScansFolder, SurvexScanSingle -#from troggle.reversion.admin import VersionAdmin #django-reversion version control class TroggleModelAdmin(admin.ModelAdmin): @@ -31,11 +30,6 @@ class SurvexBlockAdmin(TroggleModelAdmin): inlines = (RoleInline,) -# class ScannedImageInline(admin.TabularInline): - # model = ScannedImage - # extra = 4 - - class OtherCaveInline(admin.TabularInline): model = OtherCaveName extra = 1 @@ -53,24 +47,16 @@ class QMsFoundInline(admin.TabularInline): extra=1 -# class PhotoInline(admin.TabularInline): - # model = DPhoto - # exclude = ['is_mugshot' ] - # extra = 1 - - class PersonTripInline(admin.TabularInline): model = PersonTrip raw_id_fields = ('personexpedition',) extra = 1 -#class LogbookEntryAdmin(VersionAdmin): class LogbookEntryAdmin(TroggleModelAdmin): prepopulated_fields = {'slug':("title",)} search_fields = ('title','expedition__year') date_heirarchy = ('date') -# inlines = (PersonTripInline, PhotoInline, QMsFoundInline) inlines = (PersonTripInline, QMsFoundInline) class Media: css = { @@ -120,10 +106,8 @@ class EntranceAdmin(TroggleModelAdmin): search_fields = ('caveandentrance__cave__kataster_number',) -#admin.site.register(DPhoto) admin.site.register(Cave, CaveAdmin) admin.site.register(Area) -#admin.site.register(OtherCaveName) admin.site.register(CaveAndEntrance) admin.site.register(NewSubCave) admin.site.register(CaveDescription) @@ -134,15 +118,10 @@ admin.site.register(Person,PersonAdmin) admin.site.register(SurvexPersonRole) admin.site.register(PersonExpedition,PersonExpeditionAdmin) admin.site.register(LogbookEntry, LogbookEntryAdmin) -#admin.site.register(PersonTrip) admin.site.register(QM, QMAdmin) -#admin.site.register(Survey, SurveyAdmin) -#admin.site.register(ScannedImage) admin.site.register(SurvexStation) - admin.site.register(SurvexScansFolder) admin.site.register(SurvexScanSingle) - admin.site.register(DataIssue) def export_as_json(modeladmin, request, queryset): diff --git a/core/views_logbooks.py b/core/views_logbooks.py index 5c89fe5..1b4e6d1 100644 --- a/core/views_logbooks.py +++ b/core/views_logbooks.py @@ -23,7 +23,6 @@ from troggle.parsers.logbooks import LoadLogbookForExpedition from troggle.parsers.people import GetPersonExpeditionNameLookup import troggle.settings as settings -from settings import * # Django uses Context, not RequestContext when you call render # to_response. We always want to use RequestContext, so that diff --git a/core/views_statistics.py b/core/views_statistics.py index 9940790..889eb30 100644 --- a/core/views_statistics.py +++ b/core/views_statistics.py @@ -4,8 +4,6 @@ import re import django.db.models from django.db.models import Min, Max -#from django.urls import reverse, resolve -#from django.http import HttpResponse, HttpResponseRedirect from django.shortcuts import render, render_to_response from django.template import Context, loader from django.template.defaultfilters import slugify @@ -17,38 +15,37 @@ from troggle.core.models_caves import Cave, LogbookEntry from troggle.core.models_survex import SurvexLeg, SurvexBlock import troggle.settings as settings -from settings import * def pathsreport(request): pathsdict={ - "CAVEDESCRIPTIONS" : CAVEDESCRIPTIONS, - "DIR_ROOT" : DIR_ROOT, - "ENTRANCEDESCRIPTIONS" : ENTRANCEDESCRIPTIONS, - "EXPOUSER_EMAIL" : EXPOUSER_EMAIL, + "CAVEDESCRIPTIONS" : settings.CAVEDESCRIPTIONS, + "DIR_ROOT" : settings.DIR_ROOT, + "ENTRANCEDESCRIPTIONS" : settings.ENTRANCEDESCRIPTIONS, + "EXPOUSER_EMAIL" : settings.EXPOUSER_EMAIL, "EXPOUSERPASS" :"<redacted>", - "EXPOUSER" : EXPOUSER, - "EXPOWEB" : EXPOWEB, - "EXPOWEB_URL" : EXPOWEB_URL, - "FILES" : FILES, - "JSLIB_URL" : JSLIB_URL, - "LOGFILE" : LOGFILE, - "LOGIN_REDIRECT_URL" : LOGIN_REDIRECT_URL, - "MEDIA_ROOT" : MEDIA_ROOT, - "MEDIA_URL" : MEDIA_URL, - "PHOTOS_URL" : PHOTOS_URL, - "PYTHON_PATH" : PYTHON_PATH, - "REPOS_ROOT_PATH" : REPOS_ROOT_PATH, - "ROOT_URLCONF" : ROOT_URLCONF, - "STATIC_URL" : STATIC_URL, - "SURVEX_DATA" : SURVEX_DATA, - "SURVEY_SCANS" : SURVEY_SCANS, - "SURVEYS" : SURVEYS, - "SURVEYS_URL" : SURVEYS_URL, - "SVX_URL" : SVX_URL, - "THREEDCACHEDIR" : THREEDCACHEDIR, - "TUNNEL_DATA" : TUNNEL_DATA, - "URL_ROOT" : URL_ROOT + "EXPOUSER" : settings.EXPOUSER, + "EXPOWEB" : settings.EXPOWEB, + "EXPOWEB_URL" : settings.EXPOWEB_URL, + "FILES" : settings.FILES, + "JSLIB_URL" : settings.JSLIB_URL, + "LOGFILE" : settings.LOGFILE, + "LOGIN_REDIRECT_URL" : settings.LOGIN_REDIRECT_URL, + "MEDIA_ROOT" : settings.MEDIA_ROOT, + "MEDIA_URL" : settings.MEDIA_URL, + "PHOTOS_URL" : settings.PHOTOS_URL, + "PYTHON_PATH" : settings.PYTHON_PATH, + "REPOS_ROOT_PATH" : settings.REPOS_ROOT_PATH, + "ROOT_URLCONF" : settings.ROOT_URLCONF, + "STATIC_URL" : settings.STATIC_URL, + "SURVEX_DATA" : settings.SURVEX_DATA, + "SURVEY_SCANS" : settings.SURVEY_SCANS, + "SURVEYS" : settings.SURVEYS, + "SURVEYS_URL" : settings.SURVEYS_URL, + "SVX_URL" : settings.SVX_URL, + "THREEDCACHEDIR" : settings.THREEDCACHEDIR, + "TUNNEL_DATA" : settings.TUNNEL_DATA, + "URL_ROOT" : settings.URL_ROOT } # settings are unique by paths are not ncodes = len(pathsdict) |