0x2620/phantasma
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

support only_e

Browse source
This commit is contained in:
j 2021-10-29 14:45:21 +01:00
parent 4dc8719091
commit b801c52847
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/static/js/ascroll.js
View file

@ -352,7 +352,14 @@ function loadAnnotations(config) {
return return
} }
annotation.title = clip.title annotation.title = clip.title
annotations.push(annotation) if (config.only_e) {
if (annotation.value.slice(0, 2) == 'E:') {
annotation.value = annotation.value.slice(2).trim()
annotations.push(annotation)
}
} else {
annotations.push(annotation)
}
}) })
}) })
loadClips(annotations).then(annotations => { loadClips(annotations).then(annotations => {

12
app/text/models.py
View file

@ -86,7 +86,10 @@ class Text(models.Model):
'id': self.data['edit'], 'id': self.data['edit'],
'keys': [] 'keys': []
} }
clips = api.getEdit(**query)['data']['clips'] r = api.getEdit(**query)
if 'data' not in r:
return []
clips = r['data']['clips']
annotations = [] annotations = []
layer = self.data.get('layer', None) or DEFAULT_LAYER layer = self.data.get('layer', None) or DEFAULT_LAYER
for clip in clips: for clip in clips:
@ -94,7 +97,12 @@ class Text(models.Model):
if 'user' in self.data and annotation['user'] == self.data['user']: if 'user' in self.data and annotation['user'] == self.data['user']:
continue continue
annotation['title'] = clip['title'] annotation['title'] = clip['title']
annotations.append(annotation) if self.data.get('only_e'):
if annotation['value'].startswith('E:'):
annotation['value'] = annotation['value'][2:].strip()
annotations.append(annotation)
else:
annotations.append(annotation)
return self.get_clips(api, annotations) return self.get_clips(api, annotations)
def get_clips(self, api, annotations): def get_clips(self, api, annotations):