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

dev/core#1339 Dedupe screen check to carry across any data where the other contact has none by default. #15595

Merged
merged 1 commit into from
Nov 7, 2019

Conversation

eileenmcnaughton
Copy link
Contributor

@eileenmcnaughton eileenmcnaughton commented Oct 24, 2019

Overview

This change in default means that if the contact to be deleted has data in a field and the contact to be kept does not the checkbox loads as checked by default (so it's easier to keep too much data but harder to lose some.)

The user can override by unchecking - this is just what is set by default on screen load

Before

not checked by default

After

checked by default

Technical Details

Change is superficial to the form presentation

I did some cleanup getting to where I could decide the code change. I can rebase out when merged #15594

Comments

https://lab.civicrm.org/dev/core/issues/1339

@civibot
Copy link

civibot bot commented Oct 24, 2019

(Standard links)

@eileenmcnaughton
Copy link
Contributor Author

…other contact has none by default.

This change in default means that if the contact to be deleted has data in a field and the contact to be kept does not the
checkbox loads as checked by default (so it's easier to keep too much data but harder to lose some.)

https://lab.civicrm.org/dev/core/issues/1339

The user can override by unchecking - this is just what is set on screen load
@eileenmcnaughton
Copy link
Contributor Author

I've rebased

@jitendrapurohit
Copy link
Contributor

@eileenmcnaughton looks great and helpful for users in the merge process.

I've tested this and confirm that this works fine in loading the checkbox as enabled on page load. Few things that I've noticed -

  • The fix enables only contact fields on page load, eg middle name, nick name, etc. If the duplicate contact has a value for address, phone, custom fields and the main contact does not - the checkbox will not be loaded as "enabled" on the merge screen.

image
image

  • Do not email, Do not phone, etc flags are not enabled by default. Maybe, because the main contact has an empty array by default which might not pass the condition of (!isset($main[$field]) || $main[$field] === ''). I think we can ignore these flags?

image

Do we really need to worry about these fields?

@JKingsnorth
Copy link
Contributor

I haven't checked the code, but I've checked in with our database admin team here who think this would be a good and potentially time-saving improvement.

@eileenmcnaughton
Copy link
Contributor Author

@jitendrapurohit I understand your review as 'this is good - it would be good to do a follow up that takes it further'

@jitendrapurohit
Copy link
Contributor

yes @eileenmcnaughton As it is not affecting the existing functionality. I think it is good to merge this. Other fields could be added in a follow-up pr.

@seamuslee001
Copy link
Contributor

Merging based on the reviews of Jon and Jitendra

@seamuslee001 seamuslee001 merged commit a633b17 into civicrm:master Nov 7, 2019
@seamuslee001 seamuslee001 deleted the dedupe3 branch November 7, 2019 19:19
eileenmcnaughton added a commit to eileenmcnaughton/civicrm-core that referenced this pull request Jan 7, 2020
…ould otherwise be lost

Full details are here civicrm#15595 - although this does not include the
cleanup commits I did getting to this point.

Bug: T235450
Change-Id: I60d93df0ee3d34ff5c3b7b7c7e5034aafbdfd740
eileenmcnaughton added a commit to eileenmcnaughton/civicrm-core that referenced this pull request Jan 9, 2020
in the other contact's field

This partially addresses reviewer feedback about the limitations of civicrm#15595
eileenmcnaughton added a commit to eileenmcnaughton/civicrm-core that referenced this pull request Jan 9, 2020
in the other contact's field

This partially addresses reviewer feedback about the limitations of civicrm#15595
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants