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

[stable29] enh: Fix display default expire date, add tests & tiny refactors #50693

Merged
merged 5 commits into from
Feb 11, 2025

Conversation

backportbot[bot]
Copy link

@backportbot backportbot bot commented Feb 6, 2025

Backport of #50655

Warning, This backport's changes differ from the original and might be incomplete ⚠️

Todo

  • Review and resolve any conflicts
  • Amend HEAD commit to remove the line stating to skip CI

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@backportbot backportbot bot added 3. to review Waiting for reviews feature: sharing labels Feb 6, 2025
@backportbot backportbot bot added this to the Nextcloud 29.0.12 milestone Feb 6, 2025
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.

Only some commits here can be backported, some changes are for the sidebar split which only starts from 31

@nfebe
Copy link
Contributor

nfebe commented Feb 6, 2025

/backport to stable28

@nfebe
Copy link
Contributor

nfebe commented Feb 6, 2025

Needs to be backborted to 28 due modifications regard : #50192

@nfebe
Copy link
Contributor

nfebe commented Feb 6, 2025

@Altahrim Altahrim mentioned this pull request Feb 11, 2025
6 tasks
@Altahrim Altahrim force-pushed the backport/50655/stable29 branch from 5e50117 to 117e235 Compare February 11, 2025 17:05
@sorbaugh sorbaugh marked this pull request as ready for review February 11, 2025 17:48
@susnux susnux force-pushed the backport/50655/stable29 branch from 117e235 to 1c677df Compare February 11, 2025 18:18
@Pytal
Copy link
Member

Pytal commented Feb 11, 2025

The backport seems incomplete with some missing imports and missed method renaming on a quick glance fyi @susnux

Better to backport commits from the 30 backport no?

@susnux susnux force-pushed the backport/50655/stable29 branch from 1c677df to cdc4c55 Compare February 11, 2025 18:45
@susnux
Copy link
Contributor

susnux commented Feb 11, 2025

@Pytal I only fixed the compiled assets and csfixer issues, not verified the other commits.

nfebe and others added 5 commits February 11, 2025 10:51
Signed-off-by: nfebe <fenn25.fn@gmail.com>
Since `ShareEntryLink` component is used to both create and display/list the share links,
we should only set default expiration date on `share.expireDate` when we know is a new share.

Otherwise, we overidding data from the backend.

Signed-off-by: nfebe <fenn25.fn@gmail.com>
…reate share

Signed-off-by: nfebe <fenn25.fn@gmail.com>
Signed-off-by: Christopher Ng <chrng8@gmail.com>
@Pytal Pytal force-pushed the backport/50655/stable29 branch from cdc4c55 to a444382 Compare February 11, 2025 19:01
@Pytal
Copy link
Member

Pytal commented Feb 11, 2025

@Pytal I only fixed the compiled assets and csfixer issues, not verified the other commits.

Alright 👍, I've resolved the issues using the commits from the 30 backport

@AndyScherzinger AndyScherzinger merged commit 3fbbcdf into stable29 Feb 11, 2025
180 of 181 checks passed
@AndyScherzinger AndyScherzinger deleted the backport/50655/stable29 branch February 11, 2025 19:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants