layer first
This commit is contained in:
parent
b6e4d33a43
commit
5b545e6e43
1 changed files with 5 additions and 5 deletions
|
@ -39,12 +39,12 @@ def parseCondition(condition, user):
|
||||||
if not op:
|
if not op:
|
||||||
op = ''
|
op = ''
|
||||||
if get_by_id(settings.CONFIG['layers'], k):
|
if get_by_id(settings.CONFIG['layers'], k):
|
||||||
return parseCondition({'key': 'annotations__findvalue',
|
return parseCondition({'key': 'annotations__layer',
|
||||||
'value': v,
|
|
||||||
'operator': op}, user) \
|
|
||||||
& parseCondition({'key': 'annotations__layer',
|
|
||||||
'value': k,
|
'value': k,
|
||||||
'operator': '==='}, user)
|
'operator': '==='}, user) & \
|
||||||
|
parseCondition({'key': 'annotations__findvalue',
|
||||||
|
'value': v,
|
||||||
|
'operator': op}, user)
|
||||||
|
|
||||||
if op.startswith('!'):
|
if op.startswith('!'):
|
||||||
op = op[1:]
|
op = op[1:]
|
||||||
|
|
Loading…
Reference in a new issue