Merge pull request #808 from haiwen/thumbnail-fix

bugfix for 'get image thumbnail'

seahub/templates/libraries.html

@@ -250,6 +250,7 @@ app["pageOptions"] = {
     guide_enabled: {% if guide_enabled %} 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_thumbnail: {% if enable_thumbnail %} true {% else %} false {% 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 %},
     is_pro: {% if is_pro %} true {% else %} false {% endif %},

seahub/views/__init__.py

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

static/scripts/app/views/dir.js

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