haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-02 15:38:15 +00:00
Code Issues Releases Wiki Activity

Merge pull request #808 from haiwen/thumbnail-fix

Browse Source 
bugfix for 'get image thumbnail'
This commit is contained in:
llj
2015-09-14 14:41:11 +08:00
parent b19e9fcb2b 5aac9f5889
commit 75b0b4f39f
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
seahub/templates/libraries.html
View File

@@ -250,6 +250,7 @@ app["pageOptions"] = {
guide_enabled: {% if guide_enabled %} true {% else %} false {% endif %}, guide_enabled: {% if guide_enabled %} true {% else %} false {% endif %},
enable_upload_folder: {% if enable_upload_folder %} true {% else %} false {% endif %}, enable_upload_folder: {% if enable_upload_folder %} true {% else %} false {% endif %},
enable_resumable_fileupload: {% if enable_resumable_fileupload %} true {% else %} false {% endif %}, enable_resumable_fileupload: {% if enable_resumable_fileupload %} true {% else %} false {% endif %},
enable_thumbnail: {% if enable_thumbnail %} true {% else %} false {% endif %},
max_upload_file_size: {% if max_upload_file_size %} {{ max_upload_file_size }} {% else %} '' {% endif %}, max_upload_file_size: {% if max_upload_file_size %} {{ max_upload_file_size }} {% else %} '' {% endif %},
folder_perm_enabled: {% if folder_perm_enabled %} true {% else %} false {% endif %}, folder_perm_enabled: {% if folder_perm_enabled %} true {% else %} false {% endif %},
is_pro: {% if is_pro %} true {% else %} false {% endif %}, is_pro: {% if is_pro %} true {% else %} false {% endif %},

1
seahub/views/__init__.py
View File

@@ -1222,6 +1222,7 @@ def libraries(request):
"sub_lib_enabled": sub_lib_enabled, "sub_lib_enabled": sub_lib_enabled,
'enable_upload_folder': settings.ENABLE_UPLOAD_FOLDER, 'enable_upload_folder': settings.ENABLE_UPLOAD_FOLDER,
'enable_resumable_fileupload': settings.ENABLE_RESUMABLE_FILEUPLOAD, 'enable_resumable_fileupload': settings.ENABLE_RESUMABLE_FILEUPLOAD,
'enable_thumbnail': settings.ENABLE_THUMBNAIL,
'max_upload_file_size': max_upload_file_size, 'max_upload_file_size': max_upload_file_size,
'folder_perm_enabled': folder_perm_enabled, 'folder_perm_enabled': folder_perm_enabled,
'is_pro': True if is_pro_version() else False, 'is_pro': True if is_pro_version() else False,

4
static/scripts/app/views/dir.js
View File

@@ -191,6 +191,10 @@ define([
}, },
getImageThumbnail: function() { getImageThumbnail: function() {
if (!app.pageOptions.enable_thumbnail || this.dir.encrypted) {
return false;
}
var images_with_no_thumbnail = this.dir.filter(function(dirent) { var images_with_no_thumbnail = this.dir.filter(function(dirent) {
// 'dirent' is a model // 'dirent' is a model
return dirent.get('is_img') && !dirent.get('encoded_thumbnail_src'); return dirent.get('is_img') && !dirent.get('encoded_thumbnail_src');