Skip to content

Commit c376dbf

Browse files
authored
Merge pull request #44291 from nextcloud/44219-send-share-expiry-val
enh: Send empty expireDate when not expireDate set
2 parents 4177e8a + 53582af commit c376dbf

7 files changed

Lines changed: 9 additions & 11 deletions

File tree

apps/files_sharing/src/views/SharingDetailsTab.vue

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -868,9 +868,7 @@ export default {
868868
fileInfo: this.fileInfo,
869869
}
870870
871-
if (this.hasExpirationDate) {
872-
incomingShare.expireDate = this.share.expireDate
873-
}
871+
incomingShare.expireDate = this.hasExpirationDate ? this.share.expireDate : ''
874872
875873
if (this.isPasswordProtected) {
876874
incomingShare.password = this.share.password
@@ -912,9 +910,9 @@ export default {
912910
shareWith: share.shareWith,
913911
permissions: share.permissions,
914912
attributes: JSON.stringify(fileInfo.shareAttributes),
913+
expireDate: share.expireDate,
915914
...(share.note ? { note: share.note } : {}),
916915
...(share.password ? { password: share.password } : {}),
917-
...(share.expireDate ? { expireDate: share.expireDate } : {}),
918916
})
919917
return resultingShare
920918
} catch (error) {

dist/5963-5963.js.map

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/7687-7687.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/files_sharing-files_sharing_tab.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/files_sharing-files_sharing_tab.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)