From 4c2734c4d48156e7dcc04eceb4dc7261ec6c8284 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Tue, 16 Apr 2013 14:29:50 +0200 Subject: [PATCH] add alias to item instrument search --- telemeta/models/query.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/telemeta/models/query.py b/telemeta/models/query.py index 07fb1f16..0c6632d9 100644 --- a/telemeta/models/query.py +++ b/telemeta/models/query.py @@ -205,12 +205,13 @@ class MediaItemQuerySet(CoreQuerySet): def by_instrument(self, name): "Find items by instrument" - from telemeta.models.instrument import Instrument + from telemeta.models.instrument import Instrument, InstrumentAlias from telemeta.models.media import MediaItemPerformance instruments = Instrument.objects.filter(name__icontains=name) + aliases = InstrumentAlias.objects.filter(name__icontains=name) perf = [] - if instruments: - performances = MediaItemPerformance.objects.filter(instrument__in=instruments) + if instruments or aliases: + performances = MediaItemPerformance.objects.filter(Q(instrument__in=instruments) | Q(alias__in=aliases)) for performance in performances: perf.append(performance) return self.filter(performances__in=perf).distinct() -- 2.39.5