Skip to content

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

Merged
skjnldsv merged 1 commit into
nextcloud:masterfrom
cweiske:20492-move-contacts-with-birthday
Mar 26, 2021
Merged

Delete old birthday calendar object when moving contact to another ad…#22201
skjnldsv merged 1 commit into
nextcloud:masterfrom
cweiske:20492-move-contacts-with-birthday

Conversation

@cweiske

Copy link
Copy Markdown
Contributor

…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
Copy Markdown
ContributorAuthor

I only added the signoff line to the commit message.

@bj-github

Copy link
Copy Markdown

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.

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

Copy link
Copy Markdown
Member

Rebased

@skjnldsvskjnldsv left a comment

Copy link
Copy Markdown
Member

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
Copy Markdown
Member

/backport to stable20

@skjnldsv

Copy link
Copy Markdown
Member

/backport to stable21

@skjnldsv

Copy link
Copy Markdown
Member

/backport to stable19

@ChristophWurstChristophWurst left a comment

Copy link
Copy Markdown
Member

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
Copy Markdown
Member

Lots of psalm issues though :/

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

@bj-github

Copy link
Copy Markdown

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

@skjnldsv

skjnldsv commented Mar 26, 2021

Copy link
Copy Markdown
Member

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>
@skjnldsvskjnldsv 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:masterMar 26, 2021
@cweiske
cweiske deleted the 20492-move-contacts-with-birthday branch March 26, 2021 07:01
@skjnldsv

Copy link
Copy Markdown
Member

/backport to stable21

@skjnldsv

Copy link
Copy Markdown
Member

/backport to stable19

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to releaseReady to be released and/or waiting for tests to finishfeature: dav

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Can't swap contacts between address books

6 participants

@cweiske@bj-github@skjnldsv@ChristophWurst@rullzer@tcitworld