Merge branch 'master' of github.com:divio/django-filer

jrief · Nov 3, 2021 · 9e4540e · 9e4540e
2 parents 3cca87e + ccaa9a4
commit 9e4540e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/filer/admin/folderadmin.py b/filer/admin/folderadmin.py
@@ -321,7 +321,11 @@ def directory_listing(self, request, folder_id=None, viewtype=None):
         perms = FolderPermission.objects.get_read_id_list(request.user)
         root_exclude_kw = {'parent__isnull': False, 'parent__id__in': perms}
         if perms != 'All':
-            file_qs = file_qs.filter(models.Q(folder__id__in=perms) | models.Q(owner=request.user))
+            file_qs = file_qs.filter(
+                models.Q(folder__id__in=perms)
+                | models.Q(folder_id__isnull=True)
+                | models.Q(owner=request.user)
+            )
             folder_qs = folder_qs.filter(models.Q(id__in=perms) | models.Q(owner=request.user))
         else:
             root_exclude_kw.pop('parent__id__in')

diff --git a/filer/models/filemodels.py b/filer/models/filemodels.py
@@ -168,11 +168,12 @@ def _move_file(self):
         # This is needed because most of the remote File Storage backend do not
         # open the file.
         src_file = src_storage.open(src_file_name)
-        src_file.open()
+        # Context manager closes file after reading contents
+        with src_file.open() as f:
+            content_file = ContentFile(f.read())
         # hint file_data_changed callback that data is actually unchanged
         self._file_data_changed_hint = False
-        self.file = dst_storage.save(dst_file_name,
-            ContentFile(src_file.read()))
+        self.file = dst_storage.save(dst_file_name, content_file)
         src_storage.delete(src_file_name)
 
     def _copy_file(self, destination, overwrite=False):

diff --git a/filer/static/filer/js/addons/dropzone.init.js b/filer/static/filer/js/addons/dropzone.init.js
@@ -130,8 +130,11 @@ djQuery(function ($) {
                     event.preventDefault();
                 });
             },
-            error: function (file, response) {
-                showError(file.name + ': ' + response.error);
+            error: function (file, msg, response) {
+                if(response && response.error){
+                    msg += ' ; ' + response.error;
+                }
+                showError(file.name + ': ' + msg);
                 this.removeAllFiles(true);
             },
             reset: function () {