From 9b8448b3105986a4ee6ca325bbe2334594899d5b Mon Sep 17 00:00:00 2001 From: yomguy Date: Tue, 10 May 2011 10:38:08 +0200 Subject: [PATCH] add search fields to admin objects --- telemeta/admin.py | 55 ++++++++++++++++++++++++++++++++++++++------ telemeta/web/base.py | 3 +-- 2 files changed, 49 insertions(+), 9 deletions(-) diff --git a/telemeta/admin.py b/telemeta/admin.py index 1b4cac92..4e008ed3 100644 --- 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 bad7e2bd..bafa501e 100644 --- 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,}) -- 2.39.5