Merge pull request #44491 from nextcloud/backport/44291/stable27

[stable27] enh: Send empty expireDate when not expireDate set
nextcloud · Apr 8, 2024 · b7988cb · b7988cb
2 parents 4c7e817 + b3c996a
commit b7988cb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/apps/files_sharing/src/views/SharingDetailsTab.vue b/apps/files_sharing/src/views/SharingDetailsTab.vue
@@ -796,9 +796,7 @@ export default {
 					fileInfo: this.fileInfo,
 				}
 
-				if (this.hasExpirationDate) {
-					incomingShare.expireDate = this.share.expireDate
-				}
+				incomingShare.expireDate = this.hasExpirationDate ? this.share.expireDate : ''
 
 				if (this.isPasswordProtected) {
 					incomingShare.password = this.share.password
@@ -829,9 +827,9 @@ export default {
 					shareWith: share.shareWith,
 					permissions: share.permissions,
 					attributes: JSON.stringify(fileInfo.shareAttributes),
+					expireDate: share.expireDate,
 					...(share.note ? { note: share.note } : {}),
 					...(share.password ? { password: share.password } : {}),
-					...(share.expireDate ? { expireDate: share.expireDate } : {}),
 				})
 				return resultingShare
 			} catch (error) {

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