mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed upload issue when free space is not known

This commit is contained in:
Vincent Petry 2014-03-06 13:50:53 +01:00
parent 07f78c8248
commit 0dcac65aa1
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/files/js/file-upload.js
View File

@ -206,6 +206,7 @@ OC.Upload = {
add: function(e, data) { add: function(e, data) {
OC.Upload.log('add', e, data); OC.Upload.log('add', e, data);
var that = $(this); var that = $(this);
var freeSpace;
// we need to collect all data upload objects before starting the upload so we can check their existence // we need to collect all data upload objects before starting the upload so we can check their existence
// and set individual conflict actions. unfortunately there is only one variable that we can use to identify // and set individual conflict actions. unfortunately there is only one variable that we can use to identify
@ -261,7 +262,8 @@ OC.Upload = {
} }
// check free space // check free space
if (selection.totalBytes > $('#free_space').val()) { freeSpace = $('#free_space').val();
if (freeSpace >= 0 && selection.totalBytes > freeSpace) {
data.textStatus = 'notenoughspace'; data.textStatus = 'notenoughspace';
data.errorThrown = t('files', 'Not enough free space, you are uploading {size1} but only {size2} is left', { data.errorThrown = t('files', 'Not enough free space, you are uploading {size1} but only {size2} is left', {
'size1': humanFileSize(selection.totalBytes), 'size1': humanFileSize(selection.totalBytes),

2
lib/private/helper.php
View File

@ -839,7 +839,7 @@ class OC_Helper {
* @return int number of bytes representing * @return int number of bytes representing
*/ */
public static function maxUploadFilesize($dir, $freeSpace = null) { public static function maxUploadFilesize($dir, $freeSpace = null) {
if (is_null($freeSpace)){ if (is_null($freeSpace) || $freeSpace < 0){
$freeSpace = self::freeSpace($dir); $freeSpace = self::freeSpace($dir);
} }
return min($freeSpace, self::uploadLimit()); return min($freeSpace, self::uploadLimit());