sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix default quota setting of 0 B 

Signed-off-by: Julius Härtl <jus@bitgrid.net>
pull/15359/head
Julius Härtl 2019-05-03 12:19:35 +07:00
parent 3d42d4c9dc
commit b09f0741ba
No known key found for this signature in database
GPG Key ID: 4C614C6ED2CDE6DF
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
settings/src/views/Users.vue
Unescape Escape View File

@ -180,16 +180,16 @@ export default {
/**
* Validate quota string to make sure it's a valid human file size
*
*
* @param {string} quota Quota in readable format '5 GB'
* @returns {Promise|boolean}
*/
validateQuota(quota) {
// only used for new presets sent through @Tag
let validQuota = OC.Util.computerFileSize(quota);
if (validQuota === 0) {
if (validQuota === null) {
return this.setDefaultQuota('none');
} else if (validQuota !== null) {
} else {
// unify format output
return this.setDefaultQuota(OC.Util.humanFileSize(OC.Util.computerFileSize(quota)));
}
@ -295,7 +295,7 @@ export default {
if (this.selectedQuota !== false) {
return this.selectedQuota;
}
if (OC.Util.computerFileSize(this.settings.defaultQuota) > 0) {
if (this.settings.defaultQuota !== this.unlimitedQuota.id && OC.Util.computerFileSize(this.settings.defaultQuota) >= 0) {
// if value is valid, let's map the quotaOptions or return custom quota
return {id:this.settings.defaultQuota, label:this.settings.defaultQuota};
}