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

dont expose ids of empty subtitles, fixes #1333

Browse source
This commit is contained in:
j 2013-03-02 08:57:39 +00:00
commit 661e005b78
3 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pandora/annotation/models.py
View file

@ -15,7 +15,7 @@ import ox
from clip.models import Clip
from changelog.models import Changelog
from item.utils import sort_string
from item.utils import sort_string, get_by_key
import managers
import utils
from tasks import update_matches
@ -235,6 +235,10 @@ class Annotation(models.Model):
streams = self.item.streams()
if streams:
j['videoRatio'] = streams[0].aspect_ratio
subtitles = get_by_key(settings.CONFIG['layers'], 'isSubtitles', True)
if subtitles:
if 'id' in j and self.layer == subtitles['id'] and not self.value:
del j['id']
return j
def log(self):

5
pandora/clip/views.py
View file

@ -123,7 +123,8 @@ def findClips(request):
def add_annotations(key, qs, add_layer=False):
values = ['public_id', 'value', 'clip__start', 'clip__end']
if add_layer:
subtitles = utils.get_by_key(settings.CONFIG['layers'], 'isSubtitles', True)
if subtitles or add_layer:
values.append('layer')
if query['filter']:
qs = qs.filter(query['filter'])
@ -137,6 +138,8 @@ def findClips(request):
'id': a['public_id'],
'value': a['value'],
}
if a['layer'] == subtitles['id'] and not a['value']:
del l['id']
if add_layer:
l['layer'] = a['layer']
i[key].append(l)