Merge pull request #34925 from nextcloud/backport/34871/stable25

[stable25] Fix visibility of internal expire date
nextcloud · Nov 4, 2022 · 3289739 · 3289739
2 parents 4127f33 + 413ac2d
commit 3289739
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/apps/files_sharing/src/components/SharingEntry.vue b/apps/files_sharing/src/components/SharingEntry.vue
@@ -374,11 +374,14 @@ export default {
 				return this.config.isDefaultInternalExpireDateEnforced || !!this.share.expireDate
 			},
 			set(enabled) {
+				let defaultExpirationDate = this.config.defaultInternalExpirationDate
+				if (!defaultExpirationDate) {
+					defaultExpirationDate = new Date()
+				}
 				this.share.expireDate = enabled
-					? this.config.defaultInternalExpirationDate !== ''
-						? this.config.defaultInternalExpirationDate
-						: new Date()
+					? defaultExpirationDate
 					: ''
+				console.debug('Expiration date status', enabled, this.share.expireDate)
 			},
 		},
 

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