0x2620/pandora
2
1
Fork 1
Code Issues 1.2k Pull requests Releases Wiki Activity

rename Item.itemId to Item.public_id

Browse source
This commit is contained in:
j 2014-09-19 12:26:46 +00:00
commit 3232ce6989
44 changed files with 382 additions and 213 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pandora/clip/managers.py
View file

@ -59,9 +59,9 @@ def parseCondition(condition, user):
return Q()
if k == 'id':
itemId, points = v.split('/')
public_id, points = v.split('/')
points = [float('%0.03f'%float(p)) for p in points.split('-')]
q = Q(item__itemId=itemId, start=points[0], end=points[1])
q = Q(item__public_id=public_id, start=points[0], end=points[1])
return exclude and ~q or q
elif k.endswith('__id'):

4
pandora/clip/models.py
View file

@ -95,7 +95,7 @@ class MetaClip:
data = {
'id': ox.toAZ(self.id),
}
data['item'] = self.item.itemId
data['item'] = self.item.public_id
data['in'] = self.start
data['out'] = self.end
data['parts'] = self.item.json['parts']
@ -149,7 +149,7 @@ class MetaClip:
@property
def public_id(self):
return u"%s/%0.03f-%0.03f" % (self.item.itemId, float(self.start), float(self.end))
return u"%s/%0.03f-%0.03f" % (self.item.public_id, float(self.start), float(self.end))
def __unicode__(self):
return self.public_id

12
pandora/clip/views.py
View file

@ -61,7 +61,7 @@ def order_query(qs, sort):
#key mgith need to be changed, see order_sort in item/views.py
key = "sort__%s" % key
if key == 'public_id':
order_by.append('%s%s' % (operator, 'sort__itemId'))
order_by.append('%s%s' % (operator, 'sort__public_id'))
order_by.append('%s%s' % (operator, 'start'))
order_by.append('end')
else:
@ -150,8 +150,8 @@ def findClips(request):
add_annotations(layer, aqs)
elif 'position' in query:
qs = order_query(qs, query['sort'])
ids = [u'%s/%0.03f-%0.03f' % (c['item__itemId'], c['start'], c['end'])
for c in qs.values('item__itemId', 'start', 'end')]
ids = [u'%s/%0.03f-%0.03f' % (c['item__public_id'], c['start'], c['end'])
for c in qs.values('item__public_id', 'start', 'end')]
data['conditions'] = data['conditions'] + {
'value': data['position'],
'key': query['sort'][0]['key'],
@ -160,11 +160,11 @@ def findClips(request):
query = parse_query(data, request.user)
qs = order_query(query['qs'], query['sort'])
if qs.count() > 0:
response['data']['position'] = utils.get_positions(ids, [qs[0].itemId])[0]
response['data']['position'] = utils.get_positions(ids, [qs[0].public_id])[0]
elif 'positions' in data:
qs = order_query(qs, query['sort'])
ids = [u'%s/%0.03f-%0.03f' % (c['item__itemId'], c['start'], c['end'])
for c in qs.values('item__itemId', 'start', 'end')]
ids = [u'%s/%0.03f-%0.03f' % (c['item__public_id'], c['start'], c['end'])
for c in qs.values('item__public_id', 'start', 'end')]
response['data']['positions'] = utils.get_positions(ids, data['positions'])
else:
response['data']['items'] = qs.count()