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 event moving issues #37046

Merged
merged 1 commit into from
Apr 18, 2023
Merged

Fix event moving issues #37046

merged 1 commit into from
Apr 18, 2023

Conversation

max65482
Copy link
Contributor

@max65482 max65482 commented Mar 3, 2023

Fixes #4735,
fixes #4538
in calendar app and
fixes #34162 in server.

A wrong assignment of change types in the CalDav backend prevented proper synchronization of duplicated/moved events.

@szaimen szaimen added the 3. to review Waiting for reviews label Mar 3, 2023
@szaimen szaimen added this to the Nextcloud 27 milestone Mar 3, 2023
Copy link
Contributor

@miaulalala miaulalala left a comment

Choose a reason for hiding this comment

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

Makes sense!

@tcitworld
Copy link
Member

/backport to stable26

@tcitworld
Copy link
Member

/backport to stable25

@tcitworld
Copy link
Member

/backport to stable24

@ChristophWurst ChristophWurst added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Apr 17, 2023
@ChristophWurst
Copy link
Member

/rebase

@ChristophWurst
Copy link
Member

@max65482 could you please rebase your branch to latest origin/master? This will rerun CI and hopefully make all checks pass.

@splitbrainD
Copy link

Will this also fix #34162? It has been opened in nextcloud/server and I am waiting quite impatiently for a quite while now. The bug is existing in various versions.

Thanks!

@max65482
Copy link
Contributor Author

@max65482 could you please rebase your branch to latest origin/master? This will rerun CI and hopefully make all checks pass.

@ChristophWurst Done!

@max65482
Copy link
Contributor Author

Will this also fix #34162?

Yes, it should!

@splitbrainD
Copy link

Will this also fix #34162?

Yes, it should!

Awesome!

@tcitworld
Copy link
Member

One more rebase please 🙏

Signed-off-by: Maximilian Martin <maximilian_martin@gmx.de>
@max65482
Copy link
Contributor Author

@tcitworld Done!

@szaimen szaimen merged commit f74840f into nextcloud:master Apr 18, 2023
@backportbot-nextcloud
Copy link

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

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

# Create the new backport branch
git checkout -b fix/foo-stable26

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable26

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@backportbot-nextcloud
Copy link

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

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

# Create the new backport branch
git checkout -b fix/foo-stable25

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable25

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@backportbot-nextcloud
Copy link

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

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

# Create the new backport branch
git checkout -b fix/foo-stable24

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable24

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@tcitworld
Copy link
Member

Manual backports in #37812, #37813, #37814 (probably too late for the next round of releases tomorrow).

@klabu
Copy link

klabu commented Aug 7, 2023

We are still experiencing issue, mentioned in 4735
Calendar version: 4.4.4
Nextcloud version: 27.0.1

Moving an event from one calendar to another (by browser or client on macOS) leads to duplicated events on all other macOS and iOS clients. View by browser allways correct.

@max65482
Copy link
Contributor Author

max65482 commented Aug 7, 2023

Could not reproduce it with

  • Calendar version: 4.4.4
  • Nextcloud versions: 26.0.3, 27.0.1
  • Clients: Thunderbird 102.14.0 (64-Bit), iPhone Calendar App (version unknown)

Couldn't get my hands on any other iOS device yet.

@klabu
Copy link

klabu commented Aug 7, 2023

You are right. Given your result, I wiped the setup and reconfigured. Moving an event "1" on "userA" account from calendar "blue" to "red" is now being reflected on other device and "userB" (got shared access to "red" and "blue" from "userA"). First it was in the "blue", now it shows up in "red", while simultaneously being deleted from "red".
Perfect. Sorry for not having had a proper test setup. Thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish
Projects
None yet
7 participants