From 5b545e6e43dd8899a14a48c1613307ab2e0580e7 Mon Sep 17 00:00:00 2001
From: j <j@mailb.org>
Date: Thu, 30 Jun 2016 02:41:44 +0200
Subject: [PATCH] layer first

---
 pandora/clip/managers.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pandora/clip/managers.py b/pandora/clip/managers.py
index d855ccbc..453d30d3 100644
--- a/pandora/clip/managers.py
+++ b/pandora/clip/managers.py
@@ -39,12 +39,12 @@ def parseCondition(condition, user):
     if not op:
         op = ''
     if get_by_id(settings.CONFIG['layers'], k):
-        return parseCondition({'key': 'annotations__findvalue',
-                               'value': v,
-                               'operator': op}, user) \
-             & parseCondition({'key': 'annotations__layer',
+        return parseCondition({'key': 'annotations__layer',
                                'value': k,
-                               'operator': '==='}, user)
+                               'operator': '==='}, user) & \
+            parseCondition({'key': 'annotations__findvalue',
+                            'value': v,
+                            'operator': op}, user)
 
     if op.startswith('!'):
         op = op[1:]