]> git.parisson.com Git - telemeta.git/commitdiff
add alias to item instrument search
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 16 Apr 2013 12:29:50 +0000 (14:29 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 16 Apr 2013 12:29:50 +0000 (14:29 +0200)
telemeta/models/query.py

index 07fb1f16697cef20befc5af77824be42732b8ca6..0c6632d9f8102aad0454c77334e96f94162205a2 100644 (file)
@@ -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()