Skip to content

enh: Send empty expireDate when not expireDate set #44291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nfebe merged 2 commits into from
Mar 26, 2024
Merged

enh: Send empty expireDate when not expireDate set #44291

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2b0848
fix(share): Send empty expireDate when not expireDate set
nfebe Mar 18, 2024
53582af
chore(assets): Recompile assets
nextcloud-command Mar 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix(share): Send empty expireDate when not expireDate set 
When creating a new share, if the user unchecks "Set expiry date"
no `expireDate` is sent to the server.

However, the server then assumes the default configured, hence better
to send an empty value.

Signed-off-by: fenn-cs <[email protected]>
  • Loading branch information
@nfebe
nfebe committed Mar 26, 2024
commit d2b0848a292ab03943627b930cb617feaf819ea2
6 changes: 2 additions & 4 deletions apps/files_sharing/src/views/SharingDetailsTab.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -868,9 +868,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
Expand Down Expand Up @@ -912,9 +910,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) {
Expand Down