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 <fenn25.fn@gmail.com>
nextcloud · Oct 20, 2023 · d6ff703 · d6ff703
1 parent 821930e
commit d6ff703
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git 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 = [

diff --git a/dist/378-378.js b/dist/378-378.js
diff --git a/dist/378-378.js.map b/dist/378-378.js.map
diff --git a/dist/files_sharing-files_sharing_tab.js b/dist/files_sharing-files_sharing_tab.js
diff --git a/dist/files_sharing-files_sharing_tab.js.map b/dist/files_sharing-files_sharing_tab.js.map