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

Compare commits

base: 0x2620:2f7e8a078038e672e480c25463cde7bbd0ce47b5
Branches Tags
0x2620:master
0x2620:stable
..
compare: 0x2620:007b9394c742511c8105398b730bc2cbe90fff42
Branches Tags
0x2620:master
0x2620:stable

No commits in common. "2f7e8a078038e672e480c25463cde7bbd0ce47b5" and "007b9394c742511c8105398b730bc2cbe90fff42" have entirely different histories.
2f7e8a0780 ... 007b9394c7

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

2
pandora/item/models.py
View file

@ -1047,7 +1047,7 @@ class Item(models.Model):
value = len(value) value = len(value)
set_value(s, name, value) set_value(s, name, value)
elif sort_type == 'year': elif sort_type == 'year':
value = self.get(source)[:4] value = self.get(source)
set_value(s, name, value) set_value(s, name, value)
elif sort_type == 'date': elif sort_type == 'date':
value = value_ = self.get(source) value = value_ = self.get(source)

4
static/js/document.js
View file

@ -66,7 +66,7 @@ pandora.ui.document = function() {
? pandora.user.ui.documents[item.id].position ? pandora.user.ui.documents[item.id].position
: 1, : 1,
url: '/documents/' + item.id + '/' url: '/documents/' + item.id + '/'
+ pandora.safeDocumentName(item.title) + '.' + item.extension, + pandora.safePDFName(item.title + '.' + item.extension),
width: that.width(), width: that.width(),
zoom: 'fit' zoom: 'fit'
}) })
@ -80,7 +80,7 @@ pandora.ui.document = function() {
imageHeight: item.dimensions[1], imageHeight: item.dimensions[1],
imagePreviewURL: pandora.getMediaURL('/documents/' + item.id + '/256p.jpg?' + item.modified), imagePreviewURL: pandora.getMediaURL('/documents/' + item.id + '/256p.jpg?' + item.modified),
imageURL: pandora.getMediaURL('/documents/' + item.id + '/' imageURL: pandora.getMediaURL('/documents/' + item.id + '/'
+ pandora.safeDocumentName(item.title) + '.' + item.extension + '?' + item.modified), + pandora.safePDFName(item.title) + '.' + item.extension + '?' + item.modified),
imageWidth: item.dimensions[0], imageWidth: item.dimensions[0],
width: that.width() width: that.width()
}).css({ }).css({

2
static/js/utils.js
View file

@ -2640,7 +2640,7 @@ pandora.openURL = function(url) {
} }
}; };
pandora.safeDocumentName = function(name) { pandora.safePDFName = function(name) {
name = name.replace('?', '_').replace('#', '_'); name = name.replace('?', '_').replace('#', '_');
return name; return name;
}; };