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): List of share type during recipient lookup #49644

Merged
merged 2 commits into from
Dec 5, 2024

Conversation

artonge
Copy link
Contributor

@artonge artonge commented Dec 4, 2024

ShareType lists both names and ids so Object.entries return too much.

This was also making useless the following condition adding ShareType.Email

Partial revert of #49351

ShareType lists both names and ids so Object.entries return too much.

This was also making useless the following condition adding ShareType.Email

Signed-off-by: Louis Chemineau <[email protected]>
@artonge artonge self-assigned this Dec 4, 2024
@artonge artonge requested review from nfebe and skjnldsv December 4, 2024 12:38
@artonge artonge added 3. to review Waiting for reviews regression labels Dec 4, 2024
@artonge artonge added this to the Nextcloud 31 milestone Dec 4, 2024
@artonge
Copy link
Contributor Author

artonge commented Dec 4, 2024

/backport to stable30

@artonge
Copy link
Contributor Author

artonge commented Dec 4, 2024

/backport to stable29

@artonge
Copy link
Contributor Author

artonge commented Dec 4, 2024

/compile /

Signed-off-by: nextcloud-command <[email protected]>
Copy link
Member

@skjnldsv skjnldsv left a comment

Choose a reason for hiding this comment

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

🐘

@nfebe nfebe merged commit 7bc21d8 into master Dec 5, 2024
120 checks passed
@nfebe nfebe deleted the artonge/fix/sharetype branch December 5, 2024 08:31
Copy link

backportbot bot commented Dec 5, 2024

The backport to stable29 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable29
git pull origin stable29

# Create the new backport branch
git checkout -b backport/49644/stable29

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick d11f3c4c d21640ba

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/49644/stable29

Error: No changes found in backport branch


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

Copy link

backportbot bot commented Dec 5, 2024

The backport to stable30 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable30
git pull origin stable30

# Create the new backport branch
git checkout -b backport/49644/stable30

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick d11f3c4c d21640ba

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/49644/stable30

Error: No changes found in backport branch


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

@nfebe
Copy link
Contributor

nfebe commented Dec 5, 2024

Manually backported by adding here : #49631

@skjnldsv skjnldsv mentioned this pull request Jan 7, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants