Correct check for enabled expiration date

The default expiration date cannot be enforced if it is not enabled in the first place. Hence, the check for whether a share has an expiration date should not consider enforcements but only where the share expiry type is enabled. For example : Using `this.config.isDefaultExpireDateEnabled` instead of `this.config.isDefaultExpireDateEnforced` which can be verified by checking `isExpiryDateEnforced`. Resolves : #40612 Signed-off-by: fenn-cs <fenn25.fn@gmail.com> Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
nextcloud · Oct 2, 2023 · 0537bbd · 0537bbd
1 parent a092bae
commit 0537bbd
Show file tree

Hide file tree

Showing 97 changed files with 144 additions and 152 deletions.
diff --git a/apps/files_sharing/src/views/SharingDetailsTab.vue b/apps/files_sharing/src/views/SharingDetailsTab.vue
@@ -380,13 +380,19 @@ export default {
 		 */
 		hasExpirationDate: {
 			get() {
+				const isDefaultExpireDateEnabled = this.config.isDefaultExpireDateEnabled
+				const hasExistingExpirationDate = !!this.share.expireDate || isDefaultExpireDateEnabled
+				const isDefaultInternalExpireDateEnabled = this.config.isDefaultInternalExpireDateEnabled
+				const isDefaultRemoteExpireDateEnabled = this.config.isDefaultRemoteExpireDateEnabled
 				if (this.isPublicShare) {
-					return !!this.share.expireDate || this.config.isDefaultExpireDateEnforced
+					return hasExistingExpirationDate
 				}
+
 				if (this.isRemoteShare) {
-					return !!this.share.expireDate || this.config.isDefaultInternalExpireDateEnforced || this.config.isDefaultExpireDateEnforced
+					return hasExistingExpirationDate || isDefaultRemoteExpireDateEnabled
 				}
-				return !!this.share.expireDate || this.config.isDefaultInternalExpireDateEnforced || this.config.isDefaultExpireDateEnforced
+
+				return hasExistingExpirationDate || isDefaultInternalExpireDateEnabled
 			},
 			set(enabled) {
 				this.share.expireDate = enabled

diff --git a/dist/3609-3609.js b/dist/3609-3609.js
diff --git a/dist/3609-3609.js.map b/dist/3609-3609.js.map
diff --git a/dist/50-50.js b/dist/50-50.js
diff --git a/dist/50-50.js.map b/dist/50-50.js.map
diff --git a/dist/520-520.js b/dist/520-520.js
diff --git a/dist/5329-5329.js.LICENSE.txt → dist/520-520.js.LICENSE.txt b/dist/5329-5329.js.LICENSE.txt → dist/520-520.js.LICENSE.txt
diff --git a/dist/520-520.js.map b/dist/520-520.js.map
diff --git a/dist/5329-5329.js b/dist/5329-5329.js
diff --git a/dist/5329-5329.js.map b/dist/5329-5329.js.map
diff --git a/dist/5912-5912.js b/dist/5912-5912.js
diff --git a/dist/5912-5912.js.map b/dist/5912-5912.js.map
diff --git a/dist/6678-6678.js b/dist/6678-6678.js
diff --git a/dist/6678-6678.js.map b/dist/6678-6678.js.map
diff --git a/dist/6870-6870.js b/dist/6870-6870.js
diff --git a/dist/6870-6870.js.map b/dist/6870-6870.js.map
diff --git a/dist/7816-7816.js b/dist/7816-7816.js
diff --git a/dist/7816-7816.js.map b/dist/7816-7816.js.map
diff --git a/dist/comments-comments-app.js b/dist/comments-comments-app.js
diff --git a/dist/comments-comments-app.js.map b/dist/comments-comments-app.js.map
diff --git a/dist/comments-init.js b/dist/comments-init.js
diff --git a/dist/comments-init.js.map b/dist/comments-init.js.map
diff --git a/dist/core-common.js b/dist/core-common.js
diff --git a/dist/core-common.js.LICENSE.txt b/dist/core-common.js.LICENSE.txt
@@ -5,17 +5,6 @@
  * @license  MIT
  */
 
-/*!
- * Sizzle CSS Selector Engine v2.3.10
- * https://sizzlejs.com/
- *
- * Copyright JS Foundation and other contributors
- * Released under the MIT license
- * https://js.foundation/
- *
- * Date: 2023-02-14
- */
-
 /*!
  * The buffer module from node.js, for the browser.
  *
@@ -53,17 +42,14 @@
  */
 
 /*!
- * jQuery JavaScript Library v3.6.4
+ * jQuery JavaScript Library v3.7.1
  * https://jquery.com/
  *
- * Includes Sizzle.js
- * https://sizzlejs.com/
- *
  * Copyright OpenJS Foundation and other contributors
  * Released under the MIT license
  * https://jquery.org/license
  *
- * Date: 2023-03-08T15:28Z
+ * Date: 2023-08-28T13:37Z
  */
 
 /*!

diff --git a/dist/core-common.js.map b/dist/core-common.js.map
diff --git a/dist/core-login.js b/dist/core-login.js
diff --git a/dist/core-login.js.map b/dist/core-login.js.map
diff --git a/dist/core-main.js b/dist/core-main.js
diff --git a/dist/core-main.js.map b/dist/core-main.js.map
diff --git a/dist/core-profile.js b/dist/core-profile.js
diff --git a/dist/core-profile.js.map b/dist/core-profile.js.map
diff --git a/dist/core-unified-search.js b/dist/core-unified-search.js
diff --git a/dist/core-unified-search.js.map b/dist/core-unified-search.js.map
diff --git a/dist/core-unsupported-browser-redirect.js b/dist/core-unsupported-browser-redirect.js
diff --git a/dist/core-unsupported-browser-redirect.js.map b/dist/core-unsupported-browser-redirect.js.map
diff --git a/dist/core-unsupported-browser.js b/dist/core-unsupported-browser.js
diff --git a/dist/core-unsupported-browser.js.map b/dist/core-unsupported-browser.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/federatedfilesharing-vue-settings-admin.js b/dist/federatedfilesharing-vue-settings-admin.js
diff --git a/dist/federatedfilesharing-vue-settings-admin.js.map b/dist/federatedfilesharing-vue-settings-admin.js.map
diff --git a/dist/federatedfilesharing-vue-settings-personal.js b/dist/federatedfilesharing-vue-settings-personal.js
diff --git a/dist/federatedfilesharing-vue-settings-personal.js.map b/dist/federatedfilesharing-vue-settings-personal.js.map
diff --git a/dist/files-init.js b/dist/files-init.js