Skip to content

Delete old birthday calendar object when moving contact to another ad… #22201

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

Merged
merged 1 commit into from
Mar 26, 2021
Merged

Delete old birthday calendar object when moving contact to another ad… #22201

merged 1 commit into from
Mar 26, 2021

Conversation

cweiske
Copy link
Contributor

@cweiske cweiske commented Aug 11, 2020

…dress book

When an contact is moved to another address book, the contact is copied to
the second address book.
During copying, the birthday event is created - but it gets the same UID
as the contact's birthday event in the first address book.

To prevent the "Calendar object with uid already exists" error that followed,
we need to delete the old entry before the new one is created.

Resolves: #20492

@cweiske
Copy link
Contributor Author

cweiske commented Aug 14, 2020

I only added the signoff line to the commit message.

@bj-github
Copy link

Sorry, it has been a while and I was just wondering when this might filter up to a release please? I'd like to cross it off my list (i.e., know I can do some more shuffling/reorganising of my Addressbooks).

With thanks in anticipation - B.

@tcitworld tcitworld self-assigned this Mar 16, 2021
@tcitworld tcitworld added this to the Nextcloud 22 milestone Mar 16, 2021
@tcitworld tcitworld requested review from juliusknorr, skjnldsv and ChristophWurst and removed request for georgehrke March 16, 2021 07:56
@skjnldsv
Copy link
Member

Rebased

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.

Oh my, I experienced this today!!
This fixes it perfectly! Very nice @cweiske

Sorry I didn't see it before!! 🤗

@skjnldsv
Copy link
Member

/backport to stable20

@skjnldsv
Copy link
Member

/backport to stable21

@skjnldsv
Copy link
Member

/backport to stable19

Copy link
Member

@ChristophWurst ChristophWurst left a comment

Choose a reason for hiding this comment

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

Lots of psalm issues though :/

@skjnldsv
Copy link
Member

Lots of psalm issues though :/

Pushed a fix for it and for the unit tests, let's see

@bj-github
Copy link

Thank you, especially for the move to back-port it!

@skjnldsv
Copy link
Member

skjnldsv commented Mar 26, 2021

Pushed a cs/psalm fix!

acceptance failure is unrelated and also on master

…dress book

When an contact is moved to another address book, the contact is copied to
the second address book.
During copying, the birthday event is created - but it gets the same UID
as the contact's birthday event in the first address book.

To prevent the "Calendar object with uid already exists" error that followed,
we need to delete the old entry before the new one is created.

Resolves: #20492
Signed-off-by: Christian Weiske <cweiske@cweiske.de>
@skjnldsv skjnldsv added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Mar 26, 2021
@skjnldsv skjnldsv merged commit fbbcf26 into nextcloud:master Mar 26, 2021
@cweiske cweiske deleted the 20492-move-contacts-with-birthday branch March 26, 2021 07:01
@skjnldsv
Copy link
Member

/backport to stable21

@skjnldsv
Copy link
Member

/backport to stable19

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 feature: dav
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Can't swap contacts between address books
6 participants