summaryrefslogtreecommitdiffstats
path: root/core/admin.py
diff options
context:
space:
mode:
authorPhilip Sargent <philip.sargent@klebos.com>2020-06-22 00:03:23 +0100
committerPhilip Sargent <philip.sargent@klebos.com>2020-06-22 00:03:23 +0100
commit674cea629dbcbfd99c74261bba17d056fbabd8ac (patch)
tree0b322ae44f76e076f10a0187fcb56ca54d2a1b77 /core/admin.py
parent8199e67b79c4c136e7dbb65432534194c08f9195 (diff)
downloadtroggle-674cea629dbcbfd99c74261bba17d056fbabd8ac.tar.gz
troggle-674cea629dbcbfd99c74261bba17d056fbabd8ac.tar.bz2
troggle-674cea629dbcbfd99c74261bba17d056fbabd8ac.zip
clean up import statements: more specific
Diffstat (limited to 'core/admin.py')
-rw-r--r--core/admin.py23
1 files changed, 1 insertions, 22 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):