From b7a5e896f5d3bc767bbd1e7c2cc5ab109986eb0c Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Tue, 16 Apr 2013 00:14:10 +0200 Subject: [PATCH] cleanup Conflicts: telemeta/models/query.py --- telemeta/models/query.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/telemeta/models/query.py b/telemeta/models/query.py index c047add5..d01b11dc 100644 --- a/telemeta/models/query.py +++ b/telemeta/models/query.py @@ -202,8 +202,15 @@ class MediaItemQuerySet(CoreQuerySet): def by_instrument(self, instrument): "Find items by instrument" - return self.filter(instruments__in=instrument) - + from telemeta.models.instrument import Instrument + from telemeta.models.media import MediaItemPerformance + instruments = Instrument.objects.filter(name__contains=name) + perf = [] + if instruments: + performances = MediaItemPerformance.objects.filter(instrument__in=instruments) + for performance in performances: + perf.append(performance) + return self.filter(performances__in=perf).distinct() class MediaItemManager(CoreManager): "Manage media items queries" -- 2.39.5