cleanup

Conflicts:
	telemeta/models/query.py

diff --git a/telemeta/models/query.py b/telemeta/models/query.py
index c047add59558905186a42e49db666fcc9770e2ac..d01b11dc1cf4c37d884e0d30711903d01143d307 100644 (file)
--- 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"