Admin search and filters

1 files changed, 9 insertions, 15 deletions

diff --git a/core/admin.py b/core/admin.py
index 00bb41c..8aeeee4 100644
--- a/core/admin.py
+++ b/core/admin.py
@@ -46,13 +46,6 @@ class SurvexBlockAdmin(TroggleModelAdmin):
     inlines = (RoleInline,)
 
 
-# class QMsFoundInline(admin.TabularInline):
-    # model = QM
-    # fk_name = "found_by"
-    # fields = ("number", "grade", "location_description", "comment")  # need to add foreignkey to cave part
-    # extra = 1
-
-
 class PersonLogEntryInline(admin.TabularInline):
     model = PersonLogEntry
     raw_id_fields = ("personexpedition",)
@@ -63,7 +56,7 @@ class LogbookEntryAdmin(TroggleModelAdmin):
     prepopulated_fields = {"slug": ("title",)}
     search_fields = ("title", "expedition__year")
     date_heirarchy = "date"
-    # inlines = (PersonLogEntryInline, QMsFoundInline)
+    #inlines = (PersonLogEntryInline, QMsFoundInline)
 
     class Media:
         css = {"all": ("css/troggleadmin.css",)}  # this does not exist
@@ -85,25 +78,28 @@ class PersonExpeditionInline(admin.TabularInline):
 
 
 class PersonAdmin(TroggleModelAdmin):
-    search_fields = ("first_name", "last_name")
+    search_fields = ("first_name", "last_name", "slug")
+    list_display = ["slug", "first_name", "last_name" ]
     inlines = (PersonExpeditionInline,)
 
 
 class QMAdmin(TroggleModelAdmin):
-    search_fields = ("number", "expoyear")
+    search_fields = ("number", "cave", "expoyear")
     list_display = ("__str__", "grade")
     list_display_links = ("__str__",)
+    list_filter = ('grade', 'cave', 'expoyear')
     # list_editable = ("comment", "page_ref", "grade")
     # list_per_page = 20
     # raw_id_fields = ("found_by", "ticked_off_by")
 
 
 class PersonExpeditionAdmin(TroggleModelAdmin):
-    search_fields = ("person__first_name", "expedition__year")
+    search_fields = ("person__first_name", "person__slug", "expedition__year")
 
 
 class CaveAdmin(TroggleModelAdmin):
-    search_fields = ("official_name", "kataster_number", "unofficial_number")
+    search_fields = ("areacode", "official_name", "kataster_number", "unofficial_number")
+    list_display = ["areacode", "official_name"]
     extra = 4
 
 
@@ -131,11 +127,10 @@ class DrawingFileAdmin(TroggleModelAdmin):
 
 
 class WalletAdmin(TroggleModelAdmin):
-    search_fields = ("fpath",)
+    search_fields = ("fpath", "walletname", "walletyear")
 
 
 admin.site.register(Cave, CaveAdmin)
-#admin.site.register(Area)
 admin.site.register(CaveAndEntrance)
 admin.site.register(Entrance, EntranceAdmin)
 admin.site.register(SurvexBlock, SurvexBlockAdmin)
@@ -143,7 +138,6 @@ admin.site.register(DrawingFile, DrawingFileAdmin)
 admin.site.register(Expedition)
 admin.site.register(Person, PersonAdmin)
 admin.site.register(SurvexPersonRole)
-#admin.site.register(SurvexDirectory, SurvexDirectoryAdmin)
 admin.site.register(SurvexFile, SurvexFileAdmin)
 admin.site.register(SurvexStation, SurvexStationAdmin)
 admin.site.register(PersonExpedition, PersonExpeditionAdmin)