From 170a83a77ee77fbb50a42a10fb814834f0d8a744 Mon Sep 17 00:00:00 2001 From: fenn-cs Date: Fri, 20 Oct 2023 10:34:57 +0100 Subject: Do not treat `isDefaultExpireDateEnforced` as fallback `isDefaultExpireDateEnforced` and its corresponding `defaultExpirationDate` is currently treated as the enforcement fallback when share type enforcements are not set. However, `isDefaultExpireDateEnforced` and `defaultExpirationDate` are actually more like `isDefaultPublicExpireDateEnforced` and `defaultPublicExpirationDate` and therefore only applies to public shares. It might be ideal to rename this variables all the way from the backend config to the way we use them in the frontend code. Signed-off-by: fenn-cs Signed-off-by: nextcloud-command --- apps/files_sharing/src/mixins/SharesMixin.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'apps/files_sharing/src') diff --git a/apps/files_sharing/src/mixins/SharesMixin.js b/apps/files_sharing/src/mixins/SharesMixin.js index 2dfcc3e9c0e..860d1716fe0 100644 --- a/apps/files_sharing/src/mixins/SharesMixin.js +++ b/apps/files_sharing/src/mixins/SharesMixin.js @@ -140,9 +140,9 @@ export default { return this.config.isDefaultExpireDateEnforced } if (this.isRemoteShare) { - return this.config.isDefaultRemoteExpireDateEnforced || this.config.isDefaultExpireDateEnforced + return this.config.isDefaultRemoteExpireDateEnforced } - return this.config.isDefaultInternalExpireDateEnforced || this.config.isDefaultExpireDateEnforced + return this.config.isDefaultInternalExpireDateEnforced }, hasCustomPermissions() { const bundledPermissions = [ -- cgit v1.2.3