diff options
| author | Julius Härtl <jus@bitgrid.net> | 2019-05-03 12:19:35 +0200 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2019-05-07 18:42:52 +0200 |
| commit | 956e545c45392ee3b0ab7ce442dbffbc9561b8e2 (patch) | |
| tree | 01792d00c2fd8f2e9bd3aa5e93b69f57e1bf15cf | |
| parent | 843626ad1622de6375aaf35906a64c6be2d3f31b (diff) | |
| download | nextcloud-server-956e545c45392ee3b0ab7ce442dbffbc9561b8e2.tar.gz nextcloud-server-956e545c45392ee3b0ab7ce442dbffbc9561b8e2.zip | |
Fix default quota setting of 0 B
Signed-off-by: Julius Härtl <jus@bitgrid.net>
| -rw-r--r-- | settings/src/views/Users.vue | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/settings/src/views/Users.vue b/settings/src/views/Users.vue index de88851234d..cde91614bbf 100644 --- a/settings/src/views/Users.vue +++ b/settings/src/views/Users.vue @@ -168,16 +168,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))); } @@ -280,7 +280,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}; } |