Skip to content
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.

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

fix(files_sharing): Stop overwriting the share expiration date with the default expiration date #50192

Merged

Conversation

provokateurin
Copy link
Member

@provokateurin provokateurin commented Jan 15, 2025

Summary

If the admin has a default expiration date configured the share expiration date is overwritten every time, even if a different expiration date was selected for the share.

Removing this doesn't cause any problems when creating a new share with the default expiration date, since the date is added in the backend automatically.

Introduced in #49115 and slightly adjusted in #49147.

Checklist

@provokateurin provokateurin added bug 3. to review Waiting for reviews labels Jan 15, 2025
@provokateurin provokateurin added this to the Nextcloud 31 milestone Jan 15, 2025
@provokateurin provokateurin requested review from nfebe, skjnldsv, a team and szaimen and removed request for a team January 15, 2025 09:43
@provokateurin
Copy link
Member Author

/backport to stable30

@provokateurin
Copy link
Member Author

/backport to stable29

@provokateurin
Copy link
Member Author

/backport to stable28

Copy link
Contributor

@nfebe nfebe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@provokateurin
Copy link
Member Author

/compile

@provokateurin provokateurin marked this pull request as draft January 15, 2025 10:27
@provokateurin
Copy link
Member Author

Draft until test is added.

@provokateurin
Copy link
Member Author

Watch out when backporting to stable28, I saw that there are duplicate mounted() methods!

provokateurin and others added 2 commits January 15, 2025 15:48
…he default expiration date

Signed-off-by: provokateurin <[email protected]>
This should be done as soon as changed, as the value is not passed to
API but needs to be tracked internally (e.g. if you quickly press
"save").

Signed-off-by: Ferdinand Thiessen <[email protected]>
@susnux susnux force-pushed the fix/files_sharing/sharing-entry-link-override-expiration-date branch from b976221 to b55c337 Compare January 15, 2025 14:48
@susnux susnux marked this pull request as ready for review January 15, 2025 14:48
@susnux
Copy link
Contributor

susnux commented Jan 15, 2025

Tests added, needed to fix another bug otherwise test would fail.
(change date and then quickly press save was not saving the entered date).

@susnux susnux force-pushed the fix/files_sharing/sharing-entry-link-override-expiration-date branch from b55c337 to 6ef6610 Compare January 15, 2025 14:58
susnux and others added 2 commits January 15, 2025 16:10
@susnux susnux force-pushed the fix/files_sharing/sharing-entry-link-override-expiration-date branch from 6ef6610 to ddd70c9 Compare January 15, 2025 15:10
@susnux susnux merged commit 6da5897 into master Jan 15, 2025
119 of 120 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants