mirror of
https://github.com/nextcloud/server.git
synced 2026-06-09 00:32:29 -04:00
Merge pull request #44490 from nextcloud/backport/44291/stable28
[stable28] enh: Send empty expireDate when not expireDate set
This commit is contained in:
commit
cab9fc22ba
8 changed files with 9 additions and 11 deletions
|
|
@ -822,9 +822,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
|
||||
|
|
@ -857,9 +855,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) {
|
||||
|
|
|
|||
3
dist/2674-2674.js
vendored
3
dist/2674-2674.js
vendored
File diff suppressed because one or more lines are too long
1
dist/2674-2674.js.map
vendored
1
dist/2674-2674.js.map
vendored
File diff suppressed because one or more lines are too long
3
dist/8718-8718.js
vendored
Normal file
3
dist/8718-8718.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
dist/8718-8718.js.map
vendored
Normal file
1
dist/8718-8718.js.map
vendored
Normal file
File diff suppressed because one or more lines are too long
4
dist/files_sharing-files_sharing_tab.js
vendored
4
dist/files_sharing-files_sharing_tab.js
vendored
File diff suppressed because one or more lines are too long
2
dist/files_sharing-files_sharing_tab.js.map
vendored
2
dist/files_sharing-files_sharing_tab.js.map
vendored
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue