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

actually return computed values for annotation

Browse source
This commit is contained in:
j 2011-09-30 16:16:11 +02:00
parent a33c7f6325
commit af61df1f00
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pandora/annotation/models.py
View file

@ -127,14 +127,15 @@ class Annotation(models.Model):
def json(self, layer=False, keys=None): def json(self, layer=False, keys=None):
j = { j = {
'id': self.public_id,
'user': self.user.username, 'user': self.user.username,
'in': self.start,
'out': self.end,
'value': self.value,
'created': self.created,
'modified': self.modified
} }
for field in ('id', 'in', 'out', 'value', 'created', 'modified',
'hue', 'saturation', 'lightness', 'volume'):
j[field] = getattr(self, {
'id': 'public_id',
'in': 'start',
'out': 'end',
}.get(field, field))
if layer: if layer:
j['layer'] = self.layer.name j['layer'] = self.layer.name
if keys: if keys: