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

Merge pull request #7592 from nextcloud/update-quota-on-files-upload 

Update quota on files upload
This commit is contained in:
Roeland Jago Douma 2017-12-28 10:53:14 +01:00 committed by GitHub
parent 46958e4c3f c8db1ed741
commit 08cbfb6c6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,7 +130,7 @@ OC.FileUpload.prototype = {
},
/**
* Get full path for the target file,
* Get full path for the target file,
* including relative path and file name.
*
* @return {String} full path

1
apps/files/js/filelist.js
View File

@ -1768,7 +1768,6 @@
return true;
}
// TODO: parse remaining quota from PROPFIND response
this.updateStorageStatistics(true);
// first entry is the root

27
apps/files/js/files.js
View File

@ -29,6 +29,7 @@
state.dir = null;
state.call = null;
Files.updateMaxUploadFilesize(response);
Files.updateQuota(response);
});
},
/**
@ -77,6 +78,32 @@
},
updateQuota:function(response) {
if (response === undefined) {
return;
}
if (response.data !== undefined
&& response.data.quota !== undefined
&& response.data.used !== undefined
&& response.data.usedSpacePercent !== undefined) {
var humanUsed = OC.Util.humanFileSize(response.data.used, true);
var humanQuota = OC.Util.humanFileSize(response.data.quota, true);
if (response.data.quota > 0) {
$('#quota').attr('data-original-title', Math.floor(response.data.used/response.data.quota*1000)/10 + '%');
$('#quota progress').val(response.data.usedSpacePercent);
$('#quotatext').text(t('files', '{used} of {quota} used', {used: humanUsed, quota: humanQuota}));
} else {
$('#quotatext').text(t('files', '{used} used', {used: humanUsed}));
}
if (response.data.usedSpacePercent > 80) {
$('#quota progress').addClass('warn');
} else {
$('#quota progress').removeClass('warn');
}
}
},
/**
* Fix path name by removing double slash at the beginning, if any
*/

2
apps/files/lib/Helper.php
View File

@ -56,6 +56,8 @@ class Helper {
'uploadMaxFilesize' => $maxUploadFileSize,
'maxHumanFilesize' => $maxHumanFileSize,
'freeSpace' => $storageInfo['free'],
'quota' => $storageInfo['quota'],
'used' => $storageInfo['used'],
'usedSpacePercent' => (int)$storageInfo['relative'],
'owner' => $storageInfo['owner'],
'ownerDisplayName' => $storageInfo['ownerDisplayName'],

2
apps/files/templates/appnavigation.php
View File

@ -11,7 +11,7 @@
</a>
</li>
<?php } ?>
<li id="quota" class="pinned <?php
<li id="quota" class="pinned <?php p($pinned===0?'first-pinned ':'') ?><?php
if ($_['quota'] !== \OCP\Files\FileInfo::SPACE_UNLIMITED) {
?>has-tooltip" title="<?php p($_['usage_relative'] . '%');
} ?>">