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

Allow share expiry dates lower than enforced limits

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
 		},

dist/core-common.js.LICENSE.txt

@@ -58,11 +58,21 @@
  * @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
@@ -70,6 +80,14 @@
 
 /*! @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/
  *