Skip to content

Commit cab9fc2

Browse files
authored
Merge pull request #44490 from nextcloud/backport/44291/stable28
[stable28] enh: Send empty expireDate when not expireDate set
2 parents f88f3b7 + 2611c01 commit cab9fc2

File tree

8 files changed

+9
-11
lines changed

8 files changed

+9
-11
lines changed

apps/files_sharing/src/views/SharingDetailsTab.vue

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -822,9 +822,7 @@ export default {
822822
fileInfo: this.fileInfo,
823823
}
824824
825-
if (this.hasExpirationDate) {
826-
incomingShare.expireDate = this.share.expireDate
827-
}
825+
incomingShare.expireDate = this.hasExpirationDate ? this.share.expireDate : ''
828826
829827
if (this.isPasswordProtected) {
830828
incomingShare.password = this.share.password
@@ -857,9 +855,9 @@ export default {
857855
shareWith: share.shareWith,
858856
permissions: share.permissions,
859857
attributes: JSON.stringify(fileInfo.shareAttributes),
858+
expireDate: share.expireDate,
860859
...(share.note ? { note: share.note } : {}),
861860
...(share.password ? { password: share.password } : {}),
862-
...(share.expireDate ? { expireDate: share.expireDate } : {}),
863861
})
864862
return resultingShare
865863
} catch (error) {

dist/2674-2674.js

Lines changed: 0 additions & 3 deletions
This file was deleted.

dist/2674-2674.js.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

dist/8718-8718.js

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

dist/8718-8718.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)