add search fields to admin objects

diff --git a/telemeta/admin.py b/telemeta/admin.py
index 1b4cac929d0b76d3e95d80cbca50cb9f42e04375..4e008ed39f859b720ebf2583ae0e3de67c53c509 100644 (file)
--- a/telemeta/admin.py
+++ b/telemeta/admin.py
@@ -1,12 +1,53 @@
 from telemeta.models.media import *
 from telemeta.models.instrument import *
-from telemeta.models.system import User
+from telemeta.models.location import *
 from django.contrib import admin
 
-admin.site.register(MediaCollection)
-admin.site.register(MediaItem)
-admin.site.register(MediaPart)
-admin.site.register(Playlist)
-admin.site.register(PlaylistResource)
-admin.site.register(Instrument)
+
+class MediaCollectionAdmin(admin.ModelAdmin):
+    search_fields = ['title', 'code']
+
+class MediaItemAdmin(admin.ModelAdmin):
+    search_fields = ['title', 'code']
+
+class MediaPartAdmin(admin.ModelAdmin):
+    search_fields = ['title']
+
+
+class InstrumentAdmin(admin.ModelAdmin):
+     search_fields = ['name']
+     
+class InstrumentAliasAdmin(admin.ModelAdmin):
+     search_fields = ['name']
+
+class InstrumentRelationAdmin(admin.ModelAdmin):
+     search_fields = ['instrument__name', 'parent_instrument__name']
+
+class InstrumentAliasRelationAdmin(admin.ModelAdmin):
+     search_fields = ['alias__name', 'instrument__name']
+
+
+class LocationAdmin(admin.ModelAdmin):
+     search_fields = ['name']
+     
+class LocationAliasAdmin(admin.ModelAdmin):
+     search_fields = ['location__name', 'alias']
+
+class LocationRelationAdmin(admin.ModelAdmin):
+     search_fields = ['location__name', 'ancestor_location__name']
+
+
+admin.site.register(MediaCollection, MediaCollectionAdmin)
+#admin.site.register(MediaItem, MediaItemAdmin)
+admin.site.register(MediaPart, MediaPartAdmin)
+
+admin.site.register(Instrument, InstrumentAdmin)
+admin.site.register(InstrumentAlias, InstrumentAliasAdmin)
+admin.site.register(InstrumentRelation, InstrumentRelationAdmin)
+admin.site.register(InstrumentAliasRelation, InstrumentAliasRelationAdmin)
+
+admin.site.register(Location, LocationAdmin)
+#admin.site.register(LocationType)
+admin.site.register(LocationAlias, LocationAliasAdmin)
+admin.site.register(LocationRelation, LocationRelationAdmin)
 

diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index bad7e2bd9b5a8533b4a809cc794283fdb424e79f..bafa501e4fec481cf8c486c547407ca219d67289 100644 (file)
--- a/telemeta/web/base.py
+++ b/telemeta/web/base.py
@@ -1139,6 +1139,5 @@ class WebView(object):
                 return HttpResponseRedirect('/items/'+public_id)
         else:
             formset = PerformanceFormSet(instance=item)
-        return render(request, template, 
-                    {'item': item, 'formset': formset,})
+        return render(request, template, {'item': item, 'formset': formset,})