diff options
| author | Julius Härtl <jus@bitgrid.net> | 2020-11-13 12:46:12 +0100 |
|---|---|---|
| committer | Christoph Wurst <christoph@winzerhof-wurst.at> | 2020-11-17 09:43:44 +0100 |
| commit | f9536b08096ed1c80391af36d33a18198be1fced (patch) | |
| tree | 392bab69b73d2046f082d5205c34214002dc34d6 /apps | |
| parent | e051ef1d686721e8ccbedab9ee92b5876f206800 (diff) | |
| download | nextcloud-server-f9536b08096ed1c80391af36d33a18198be1fced.tar.gz nextcloud-server-f9536b08096ed1c80391af36d33a18198be1fced.zip | |
Check for target folder available quota when uploading
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/js/file-upload.js | 13 | ||||
| -rw-r--r-- | apps/files/js/filelist.js | 2 | ||||
| -rw-r--r-- | apps/files/tests/js/filelistSpec.js | 5 |
3 files changed, 17 insertions, 3 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index 691131293a8..3c0ca319225 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -918,7 +918,7 @@ OC.Uploader.prototype = _.extend({ */ add: function(e, data) { self.log('add', e, data); - var that = $(this), freeSpace; + var that = $(this), freeSpace = 0; var upload = new OC.FileUpload(self, data); // can't link directly due to jQuery not liking cyclic deps on its ajax object @@ -989,13 +989,20 @@ OC.Uploader.prototype = _.extend({ } // check free space - freeSpace = $('#free_space').val(); + if (!self.fileList || upload.getTargetFolder() === self.fileList.getCurrentDirectory()) { + // Use global free space if there is no file list to check or the current directory is the target + freeSpace = $('#free_space').val() + } else if (upload.getTargetFolder().indexOf(self.fileList.getCurrentDirectory()) === 0) { + // Check subdirectory free space if file is uploaded there + var targetSubdir = upload._targetFolder.replace(self.fileList.getCurrentDirectory(), '') + freeSpace = parseInt(upload.uploader.fileList.getModelForFile(targetSubdir).get('quotaAvailableBytes')) + } if (freeSpace >= 0 && selection.totalBytes > freeSpace) { data.textStatus = 'notenoughspace'; data.errorThrown = t('files', 'Not enough free space, you are uploading {size1} but only {size2} is left', { 'size1': OC.Util.humanFileSize(selection.totalBytes), - 'size2': OC.Util.humanFileSize($('#free_space').val()) + 'size2': OC.Util.humanFileSize(freeSpace) }); } diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 86e978d178b..30bc35551d6 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -1236,6 +1236,7 @@ mtime: parseInt($el.attr('data-mtime'), 10), type: $el.attr('data-type'), etag: $el.attr('data-etag'), + quotaAvailableBytes: $el.attr('data-quota'), permissions: parseInt($el.attr('data-permissions'), 10), hasPreview: $el.attr('data-has-preview') === 'true', isEncrypted: $el.attr('data-e2eencrypted') === 'true' @@ -1495,6 +1496,7 @@ "data-mime": mime, "data-mtime": mtime, "data-etag": fileData.etag, + "data-quota": fileData.quotaAvailableBytes, "data-permissions": permissions, "data-has-preview": fileData.hasPreview !== false, "data-e2eencrypted": fileData.isEncrypted === true diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js index daa91735455..04a71c1ce8b 100644 --- a/apps/files/tests/js/filelistSpec.js +++ b/apps/files/tests/js/filelistSpec.js @@ -2238,6 +2238,7 @@ describe('OCA.Files.FileList tests', function() { type: 'file', size: 12, etag: 'abc', + quotaAvailableBytes: '-1', permissions: OC.PERMISSION_ALL, hasPreview: true, isEncrypted: false @@ -2249,6 +2250,7 @@ describe('OCA.Files.FileList tests', function() { mimetype: 'application/pdf', mtime: 234560000, size: 58009, + quotaAvailableBytes: '-1', etag: '123', permissions: OC.PERMISSION_ALL, hasPreview: true, @@ -2261,6 +2263,7 @@ describe('OCA.Files.FileList tests', function() { mimetype: 'httpd/unix-directory', mtime: 134560000, size: 250, + quotaAvailableBytes: '-1', etag: '456', permissions: OC.PERMISSION_ALL, hasPreview: true, @@ -2284,6 +2287,7 @@ describe('OCA.Files.FileList tests', function() { mtime: 123456789, type: 'file', size: 12, + quotaAvailableBytes: '-1', etag: 'abc', permissions: OC.PERMISSION_ALL, hasPreview: true, @@ -2296,6 +2300,7 @@ describe('OCA.Files.FileList tests', function() { mimetype: 'httpd/unix-directory', mtime: 134560000, size: 250, + quotaAvailableBytes: '-1', etag: '456', permissions: OC.PERMISSION_ALL, hasPreview: true, |