diff options
| author | Julien Veyssier <eneiluj@posteo.net> | 2021-07-29 14:04:41 +0300 |
|---|---|---|
| committer | npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com> | 2021-07-29 22:31:36 +0300 |
| commit | 416d10f76c9b05a5a1e51058486f6e5cffd6c498 (patch) | |
| tree | cf4efa06c62498d5bc15d83b7cf8d277b7235643 /apps/settings/src | |
| parent | 6f1c2ed50b036e5f910be48ed84e6e2a9a8e4a89 (diff) | |
refs #21045 add app config to disable unlimited quota and to set max quota
avoid unlimited quota as default_quota fallback value if unlimited quota is not allowed
avoid getting/setting/displaying unlimited default quota if not allowed
implement tests for unlimited quota restrictions
Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
Diffstat (limited to 'apps/settings/src')
| -rw-r--r-- | apps/settings/src/components/UserList.vue | 4 | ||||
| -rw-r--r-- | apps/settings/src/views/Users.vue | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/apps/settings/src/components/UserList.vue b/apps/settings/src/components/UserList.vue index c9a326d26f3..5459a04398e 100644 --- a/apps/settings/src/components/UserList.vue +++ b/apps/settings/src/components/UserList.vue @@ -345,7 +345,9 @@ export default { label: cur, }), []) // add default presets - quotaPreset.unshift(this.unlimitedQuota) + if (this.settings.allowUnlimitedQuota) { + quotaPreset.unshift(this.unlimitedQuota) + } quotaPreset.unshift(this.defaultQuota) return quotaPreset }, diff --git a/apps/settings/src/views/Users.vue b/apps/settings/src/views/Users.vue index 8c7dcdaacc2..d57c16cc44a 100644 --- a/apps/settings/src/views/Users.vue +++ b/apps/settings/src/views/Users.vue @@ -274,7 +274,9 @@ export default { // convert the preset array into objects const quotaPreset = this.settings.quotaPreset.reduce((acc, cur) => acc.concat({ id: cur, label: cur }), []) // add default presets - quotaPreset.unshift(this.unlimitedQuota) + if (this.settings.allowUnlimitedQuota) { + quotaPreset.unshift(this.unlimitedQuota) + } return quotaPreset }, // mapping saved values to objects |