layer first

This commit is contained in:
j 2016-06-30 02:41:44 +02:00
parent b6e4d33a43
commit 5b545e6e43
1 changed files with 5 additions and 5 deletions

View File

@ -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:]