Check expiry enforcement for all share types

We should check that a maximum expiry date has been enforced for all shares and NOT JUST FOR internal shares before enforcing a UI max date, like in commit 9757e68 Signed-off-by: fenn-cs <fenn25.fn@gmail.com>
nextcloud · Oct 16, 2023 · 9ac70a2 · 9ac70a2
1 parent b914916
commit 9ac70a2
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/apps/files_sharing/src/views/SharingDetailsTab.vue b/apps/files_sharing/src/views/SharingDetailsTab.vue
@@ -430,14 +430,14 @@ export default {
 			return this.fileInfo.type === 'dir'
 		},
 		maxExpirationDateEnforced() {
-			if (this.isPublicShare) {
-				return this.config.defaultExpirationDate
-			}
-			if (this.isRemoteShare) {
-				return this.config.defaultRemoteExpirationDateString
-			}
-			// If it get's here then it must be an internal share
 			if (this.isExpiryDateEnforced) {
+				if (this.isPublicShare) {
+					return this.config.defaultExpirationDate
+				}
+				if (this.isRemoteShare) {
+					return this.config.defaultRemoteExpirationDateString
+				}
+				// If it get's here then it must be an internal share
 				return this.config.defaultInternalExpirationDate
 			}
 			return null

diff --git a/dist/280-280.js b/dist/280-280.js
diff --git a/dist/280-280.js.map b/dist/280-280.js.map
diff --git a/dist/8972-8972.js b/dist/8972-8972.js
diff --git a/dist/280-280.js.LICENSE.txt → dist/8972-8972.js.LICENSE.txt b/dist/280-280.js.LICENSE.txt → dist/8972-8972.js.LICENSE.txt
diff --git a/dist/8972-8972.js.map b/dist/8972-8972.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