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

don't pass user as keys

Browse source
This commit is contained in:
j 2018-11-14 16:09:24 +00:00
parent dc0132a913
commit 503ae10e89
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pandora/clip/models.py
View file

@ -96,7 +96,7 @@ class MetaClip(object):
clip_keys = ('id', 'in', 'out', 'position', 'created', 'modified', clip_keys = ('id', 'in', 'out', 'position', 'created', 'modified',
'hue', 'saturation', 'lightness', 'volume', 'videoRatio') 'hue', 'saturation', 'lightness', 'volume', 'videoRatio')
def json(self, keys=None, qs=None): def json(self, keys=None, qs=None, user=None):
j = {} j = {}
for key in self.clip_keys: for key in self.clip_keys:
j[key] = getattr(self, { j[key] = getattr(self, {

2
pandora/edit/models.py
View file

@ -257,7 +257,7 @@ class Edit(models.Model):
def get_clips_json(self, user=None): def get_clips_json(self, user=None):
qs = self.get_clips(user) qs = self.get_clips(user)
if self.type == 'static': if self.type == 'static':
clips = [c.json(user) for c in qs.order_by('index')] clips = [c.json(user=user) for c in qs.order_by('index')]
else: else:
if qs is None: if qs is None:
clips = [] clips = []