Skip to content

[stable25] Fix upload of pictures into album #1603

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

Jump to bottom
Merged
artonge merged 2 commits into from
Jan 25, 2023
Merged

[stable25] Fix upload of pictures into album #1603

artonge merged 2 commits into from
Jan 25, 2023

Conversation

@simonspa
Copy link

@simonspa simonspa commented Jan 23, 2023

Backport of #1599

Fix comparison in PreviewController: album Ids are int
f7bb827 
Signed-off-by: Simon Spannagel <[email protected]>
(cherry picked from commit 3a8e935)
@simonspa simonspa changed the title Fix upload of pictures into album [stable25] Fix upload of pictures into album Jan 23, 2023
@simonspa simonspa added this to the Nextcloud 25.0.4 milestone Jan 23, 2023
@szaimen szaimen requested a review from artonge January 25, 2023 02:40
@szaimen szaimen added the 3. to review Waiting for reviews label Jan 25, 2023
marcelklehr
marcelklehr previously requested changes Jan 25, 2023
View reviewed changes
Copy link
Member

@marcelklehr marcelklehr left a comment

Choose a reason for hiding this comment

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

this change is missing? https://github.com/nextcloud/photos/pull/1599/files#diff-9706d467ff74e216f41e0da8dd6424754754a63018ff15b3e7fadcef9d33f811R98

@simonspa
Copy link
Author

simonspa commented Jan 25, 2023

Yes, the related changes were only made (and broken) in master but not in stable25. That was also the reason the automatic backport failed.

@artonge artonge merged commit e56906b into nextcloud:stable25 Jan 25, 2023
@blizzz blizzz mentioned this pull request Feb 6, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@artonge artonge artonge approved these changes

@marcelklehr marcelklehr marcelklehr left review comments

@skjnldsv skjnldsv Awaiting requested review from skjnldsv

Assignees

No one assigned

Labels

3. to review Waiting for reviews

Projects

None yet

Milestone

Nextcloud 25.0.4

Development

Successfully merging this pull request may close these issues.

4 participants

@simonspa @marcelklehr @artonge @szaimen