diff --git a/core/admin.py b/core/admin.py index d6bac8c..831fdc6 100644 --- a/core/admin.py +++ b/core/admin.py @@ -41,17 +41,14 @@ class RoleInline(admin.TabularInline): model = SurvexPersonRole extra = 4 - class SurvexBlockAdmin(TroggleModelAdmin): inlines = (RoleInline,) - class PersonLogEntryInline(admin.TabularInline): model = PersonLogEntry raw_id_fields = ("personexpedition",) extra = 1 - class LogbookEntryAdmin(TroggleModelAdmin): prepopulated_fields = {"slug": ("title",)} search_fields = ("title", "expedition__year") @@ -71,18 +68,15 @@ class LogbookEntryAdmin(TroggleModelAdmin): response = downloadLogbook(request=request, queryset=queryset, extension="txt") # fails, no queryset return response - class PersonExpeditionInline(admin.TabularInline): model = PersonExpedition extra = 1 - class PersonAdmin(TroggleModelAdmin): search_fields = ("first_name", "last_name", "slug") list_display = ["slug", "first_name", "last_name" ] inlines = (PersonExpeditionInline,) - class QMAdmin(TroggleModelAdmin): search_fields = ("number", "cave", "expoyear") list_display = ("__str__", "grade") @@ -92,40 +86,31 @@ class QMAdmin(TroggleModelAdmin): # list_per_page = 20 # raw_id_fields = ("found_by", "ticked_off_by") - class PersonExpeditionAdmin(TroggleModelAdmin): search_fields = ("person__first_name", "person__slug", "expedition__year") - class CaveAdmin(TroggleModelAdmin): search_fields = ("areacode", "official_name", "kataster_number", "unofficial_number") list_display = ["areacode", "official_name"] extra = 4 - class EntranceAdmin(TroggleModelAdmin): search_fields = ("caveandentrance__cave__kataster_number",) - class SurvexStationAdmin(TroggleModelAdmin): search_fields = ("name",) - class SurvexFileAdmin(TroggleModelAdmin): search_fields = ("path",) - -# class SurvexDirectoryAdmin(TroggleModelAdmin): - # search_fields = ( - # "path", - # "survexdirectory", - # ) - + +class SurvexBlockAdmin(TroggleModelAdmin): + search_fields = ("name", ) + list_display = ["survexfile", "name"] class DrawingFileAdmin(TroggleModelAdmin): search_fields = ("dwgname",) - class WalletAdmin(TroggleModelAdmin): search_fields = ("fpath", "walletname", "walletyear") @@ -133,12 +118,12 @@ class WalletAdmin(TroggleModelAdmin): admin.site.register(Cave, CaveAdmin) admin.site.register(CaveAndEntrance) admin.site.register(Entrance, EntranceAdmin) -admin.site.register(SurvexBlock, SurvexBlockAdmin) admin.site.register(DrawingFile, DrawingFileAdmin) admin.site.register(Expedition) admin.site.register(Person, PersonAdmin) admin.site.register(SurvexPersonRole) admin.site.register(SurvexFile, SurvexFileAdmin) +admin.site.register(SurvexBlock, SurvexBlockAdmin) admin.site.register(SurvexStation, SurvexStationAdmin) admin.site.register(PersonExpedition, PersonExpeditionAdmin) admin.site.register(LogbookEntry, LogbookEntryAdmin)