From 503ae10e89d133ce9cfbd23e24df105bd84a5c0d Mon Sep 17 00:00:00 2001 From: j Date: Wed, 14 Nov 2018 16:09:24 +0000 Subject: [PATCH] don't pass user as keys --- pandora/clip/models.py | 2 +- pandora/edit/models.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora/clip/models.py b/pandora/clip/models.py index 76cc45885..f4f556518 100644 --- a/pandora/clip/models.py +++ b/pandora/clip/models.py @@ -96,7 +96,7 @@ class MetaClip(object): clip_keys = ('id', 'in', 'out', 'position', 'created', 'modified', 'hue', 'saturation', 'lightness', 'volume', 'videoRatio') - def json(self, keys=None, qs=None): + def json(self, keys=None, qs=None, user=None): j = {} for key in self.clip_keys: j[key] = getattr(self, { diff --git a/pandora/edit/models.py b/pandora/edit/models.py index 554ae0689..2dfe2ee03 100644 --- a/pandora/edit/models.py +++ b/pandora/edit/models.py @@ -257,7 +257,7 @@ class Edit(models.Model): def get_clips_json(self, user=None): qs = self.get_clips(user) 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: if qs is None: clips = []