summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2019-05-03 12:19:35 +0200
committerJulius Härtl <jus@bitgrid.net>2019-05-03 12:19:35 +0200
commitb09f0741ba2d8aa697b39b34f2bab65990764cb2 (patch)
tree1587de4af0ab0f87769ddf20ca8281938ed1ac68 /settings
parent3d42d4c9dc75f0bddda5140835ff0a232768d529 (diff)
downloadnextcloud-server-b09f0741ba2d8aa697b39b34f2bab65990764cb2.tar.gz
nextcloud-server-b09f0741ba2d8aa697b39b34f2bab65990764cb2.zip
Fix default quota setting of 0 B
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'settings')
-rw-r--r--settings/src/views/Users.vue8
1 files changed, 4 insertions, 4 deletions
diff --git a/settings/src/views/Users.vue b/settings/src/views/Users.vue
index a878e5fe49a..d88c15a5e0d 100644
--- a/settings/src/views/Users.vue
+++ b/settings/src/views/Users.vue
@@ -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};
}