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

don't return empty string for undefined values, handle in context browser

This commit is contained in:
j 2015-05-23 15:11:18 +05:30
parent 0504eaf227
commit 5da83f6f6d
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora/item/views.py
View File

@ -234,7 +234,7 @@ def find(request, data):
elif p == 'timesaccessed':
r[p] = m.sort.timesaccessed
else:
r[p] = m.json.get(p, '')
r[p] = m.json.get(p)
if 'clip_qs' in query:
r['clips'] = get_clips(query['clip_qs'].filter(item=m))
return r
@ -243,7 +243,7 @@ def find(request, data):
if m:
m = json.loads(m, object_hook=ox.django.fields.from_json)
for p in _p:
r[p] = m.get(p, '')
r[p] = m.get(p)
if 'clip_qs' in query:
r['clips'] = get_clips(query['clip_qs'].filter(item__public_id=m['id']))
return r

4
static/js/browser.js
View File

@ -88,7 +88,9 @@ pandora.ui.browser = function() {
} else {
// fixme: this is duplicated many times
format = pandora.getSortKeyData(sortKey).format;
if (format) {
if (Ox.isUndefined(data[sortKey]) || Ox.isNull(data[sortKey])) {
info = '';
} else if (format) {
info = (
/^color/.test(format.type.toLowerCase()) ? Ox.Theme : Ox
)['format' + Ox.toTitleCase(format.type)].apply(