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> Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
nextcloud · Oct 22, 2023 · eb0c923 · eb0c923
1 parent 46308e9
commit eb0c923
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 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/4511-4511.js b/dist/4511-4511.js
diff --git a/dist/4511-4511.js.map b/dist/4511-4511.js.map
diff --git a/dist/dav-settings-personal-availability.js b/dist/dav-settings-personal-availability.js
diff --git a/dist/dav-settings-personal-availability.js.map b/dist/dav-settings-personal-availability.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