decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

support nested smart edit queries

Browse source
This commit is contained in:
j 2014-02-07 10:13:49 +00:00
parent cfe8691f1a
commit fbaa24b9aa
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
pandora/edit/models.py
View file

@ -220,15 +220,23 @@ class Edit(models.Model):
return clips
def clip_query(self):
query = {
'conditions': [],
def get_conditions(conditions):
clip_conditions = []
for condition in conditions:
if 'conditions' in condition:
clip_conditions.append({
'operator': condition.get('operator', '&'),
'conditions': get_conditions(condition['conditions'])
})
elif condition['key'] == 'annotations' or \
get_by_id(settings.CONFIG['layers'], condition['key']):
clip_conditions.append(condition)
return clip_conditions
return {
'conditions': get_conditions(self.query.get('conditions', [])),
'operator': self.query.get('operator', '&')
}
for condition in self.query.get('conditions', []):
if condition['key'] == 'annotations' or \
get_by_id(settings.CONFIG['layers'], condition['key']):
query['conditions'].append(condition)
return query
def update_icon(self):
frames = []