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

Compare commits

base: 0x2620:098811d3838f90e9248c8da613f87f9dc01d16a1
Branches Tags
0x2620:master
0x2620:stable
..
compare: 0x2620:a4d0830e4bcc708821e73f401f7886612a128703
Branches Tags
0x2620:master
0x2620:stable

No commits in common. "098811d3838f90e9248c8da613f87f9dc01d16a1" and "a4d0830e4bcc708821e73f401f7886612a128703" have entirely different histories.
098811d383 ... a4d0830e4b

2 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pandora/item/views.py
View file

@ -948,11 +948,9 @@ def timeline(request, id, size, position=-1, format='jpg', mode=None):
if not item.access(request.user): if not item.access(request.user):
return HttpResponseForbidden() return HttpResponseForbidden()
modes = [t['id'] for t in settings.CONFIG['timelines']]
if not mode: if not mode:
mode = 'antialias' mode = 'antialias'
if mode not in modes: modes = [t['id'] for t in settings.CONFIG['timelines']]
mode = modes[0]
if mode not in modes: if mode not in modes:
raise Http404 raise Http404
modes.pop(modes.index(mode)) modes.pop(modes.index(mode))

1
static/js/documentInfoView.js
View file

@ -559,7 +559,6 @@ pandora.ui.documentInfoView = function(data, isMixed) {
$('<span>').html(formatKey(key)).appendTo($element); $('<span>').html(formatKey(key)).appendTo($element);
Ox.EditableContent({ Ox.EditableContent({
clickLink: pandora.clickLink, clickLink: pandora.clickLink,
editable: canEdit,
format: function(value) { format: function(value) {
return formatValue(key, value); return formatValue(key, value);
}, },