refs #21045 avoid getting/setting/displaying unlimited default quota …

…if not allowed Signed-off-by: Julien Veyssier <[email protected]> Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
nextcloud · Jul 19, 2021 · d26c684 · d26c684
1 parent 8cd57de
commit d26c684
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 4 deletions.
diff --git a/apps/provisioning_api/lib/Controller/AppConfigController.php b/apps/provisioning_api/lib/Controller/AppConfigController.php
@@ -162,5 +162,12 @@ protected function verifyConfigKey(string $app, string $key, string $value) {
 		if ($app === 'core' && (strpos($key, 'public_') === 0 || strpos($key, 'remote_') === 0)) {
 			throw new \InvalidArgumentException('The given key can not be set');
 		}
+
+		if ($app === 'files'
+			&& $key === 'default_quota'
+			&& $value === 'none'
+			&& $this->config->getAppValue('files', 'allow_unlimited_quota', '1') === '0') {
+			throw new \InvalidArgumentException('The given key can not be set');
+		}
 	}
 }
diff --git a/apps/settings/js/vue-settings-apps-users-management.js b/apps/settings/js/vue-settings-apps-users-management.js
diff --git a/apps/settings/js/vue-settings-apps-users-management.js.map b/apps/settings/js/vue-settings-apps-users-management.js.map
diff --git a/apps/settings/js/vue-settings-users-a086f4bfa15a702efa12.js b/apps/settings/js/vue-settings-users-a086f4bfa15a702efa12.js
diff --git a/apps/settings/js/vue-settings-users-a086f4bfa15a702efa12.js.map b/apps/settings/js/vue-settings-users-a086f4bfa15a702efa12.js.map
diff --git a/apps/settings/src/views/Users.vue b/apps/settings/src/views/Users.vue
@@ -273,7 +273,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