Ensure inbox db index is used during all label-specific searches

rapidpro · Jul 18, 2016 · 4ad3022 · 4ad3022
1 parent 7ddc58b
commit 4ad3022
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/casepro/msgs/models.py b/casepro/msgs/models.py
@@ -247,11 +247,11 @@ def search(cls, org, user, search):
 
         if all_label_access:
             if folder == MessageFolder.inbox:
+                queryset = queryset.filter(has_labels=True)
                 if label_id:
                     label = Label.get_all(org, user).filter(pk=label_id).first()
                     queryset = queryset.filter(labels=label)
-                else:
-                    queryset = queryset.filter(has_labels=True)
+
             elif folder == MessageFolder.unlabelled:
                 # only show inbox messages in unlabelled
                 queryset = queryset.filter(type=Message.TYPE_INBOX, has_labels=False)