Merge pull request #40927 from nextcloud/allow-expiry-dates-less-than…

…-enforced-limit Allow share expiry dates lower than enforced limits
nextcloud · Oct 16, 2023 · c932c94 · c932c94
2 parents 9bf824e + 9757e68
commit c932c94
Show file tree

Hide file tree

Showing 31 changed files with 71 additions and 49 deletions.
diff --git a/apps/files_sharing/src/views/SharingDetailsTab.vue b/apps/files_sharing/src/views/SharingDetailsTab.vue
@@ -119,11 +119,10 @@
 				</NcCheckboxRadioSwitch>
 				<NcDateTimePickerNative v-if="hasExpirationDate"
 					id="share-date-picker"
-					:value="new Date(share.expireDate)"
+					:value="new Date(share.expireDate ?? dateTomorrow)"
 					:min="dateTomorrow"
-					:max="dateMaxEnforced"
+					:max="maxExpirationDateEnforced"
 					:hide-label="true"
-					:disabled="isExpiryDateEnforced"
 					:placeholder="t('files_sharing', 'Expiration date')"
 					type="date"
 					@input="onExpirationChange" />
@@ -430,11 +429,16 @@ export default {
 		isFolder() {
 			return this.fileInfo.type === 'dir'
 		},
-		dateMaxEnforced() {
-			if (!this.isRemoteShare && this.config.isDefaultInternalExpireDateEnforced) {
-				return new Date(new Date().setDate(new Date().getDate() + 1 + this.config.defaultInternalExpireDate))
-			} else if (this.config.isDefaultRemoteExpireDateEnforced) {
-				return new Date(new Date().setDate(new Date().getDate() + 1 + this.config.defaultRemoteExpireDate))
+		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) {
+				return this.config.defaultInternalExpirationDate
 			}
 			return null
 		},

diff --git a/dist/523-523.js → dist/280-280.js b/dist/523-523.js → dist/280-280.js
diff --git a/dist/523-523.js.LICENSE.txt → dist/280-280.js.LICENSE.txt b/dist/523-523.js.LICENSE.txt → dist/280-280.js.LICENSE.txt
diff --git a/dist/280-280.js.map b/dist/280-280.js.map
diff --git a/dist/523-523.js.map b/dist/523-523.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
@@ -58,18 +58,36 @@
  * @license MIT
  */
 
+/*!
+* focus-trap 7.2.0
+* @license MIT, https://github.com/focus-trap/focus-trap/blob/master/LICENSE
+*/
+
 /*!
 * focus-trap 7.5.2
 * @license MIT, https://github.com/focus-trap/focus-trap/blob/master/LICENSE
 */
 
+/*!
+* tabbable 6.0.1
+* @license MIT, https://github.com/focus-trap/tabbable/blob/master/LICENSE
+*/
+
 /*!
 * tabbable 6.2.0
 * @license MIT, https://github.com/focus-trap/tabbable/blob/master/LICENSE
 */
 
 /*! @license DOMPurify 3.0.5 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/3.0.5/LICENSE */
 
+/*! For license information please see NcButton.js.LICENSE.txt */
+
+/*! For license information please see NcModal.js.LICENSE.txt */
+
+/*! For license information please see NcNoteCard.js.LICENSE.txt */
+
+/*! For license information please see NcPasswordField.js.LICENSE.txt */
+
 /*! Hammer.JS - v2.0.7 - 2016-04-22
  * http://hammerjs.github.io/
  *

diff --git a/dist/core-common.js.map b/dist/core-common.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/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
diff --git a/dist/preview-service-worker.js b/dist/preview-service-worker.js
diff --git a/dist/settings-vue-settings-admin-basic-settings.js b/dist/settings-vue-settings-admin-basic-settings.js
diff --git a/dist/settings-vue-settings-admin-basic-settings.js.map b/dist/settings-vue-settings-admin-basic-settings.js.map
diff --git a/dist/settings-vue-settings-admin-security.js b/dist/settings-vue-settings-admin-security.js
diff --git a/dist/settings-vue-settings-admin-security.js.map b/dist/settings-vue-settings-admin-security.js.map
diff --git a/dist/settings-vue-settings-apps-users-management.js b/dist/settings-vue-settings-apps-users-management.js
diff --git a/dist/settings-vue-settings-apps-users-management.js.map b/dist/settings-vue-settings-apps-users-management.js.map
diff --git a/dist/settings-vue-settings-personal-info.js b/dist/settings-vue-settings-personal-info.js
diff --git a/dist/settings-vue-settings-personal-info.js.map b/dist/settings-vue-settings-personal-info.js.map
diff --git a/dist/settings-vue-settings-personal-security.js b/dist/settings-vue-settings-personal-security.js
diff --git a/dist/settings-vue-settings-personal-security.js.map b/dist/settings-vue-settings-personal-security.js.map
diff --git a/dist/settings-vue-settings-personal-webauthn.js b/dist/settings-vue-settings-personal-webauthn.js
diff --git a/dist/settings-vue-settings-personal-webauthn.js.map b/dist/settings-vue-settings-personal-webauthn.js.map
diff --git a/dist/sharebymail-vue-settings-admin-sharebymail.js b/dist/sharebymail-vue-settings-admin-sharebymail.js
diff --git a/dist/sharebymail-vue-settings-admin-sharebymail.js.map b/dist/sharebymail-vue-settings-admin-sharebymail.js.map
diff --git a/dist/twofactor_backupcodes-settings.js b/dist/twofactor_backupcodes-settings.js
diff --git a/dist/twofactor_backupcodes-settings.js.map b/dist/twofactor_backupcodes-settings.js.map
diff --git a/dist/workflowengine-workflowengine.js b/dist/workflowengine-workflowengine.js
diff --git a/dist/workflowengine-workflowengine.js.map b/dist/workflowengine-workflowengine.js.map