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.

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

Add user friendly error message on merge error #16340

Merged
merged 1 commit into from
Jan 21, 2020
Merged

Add user friendly error message on merge error #16340

merged 1 commit into from
Jan 21, 2020

Conversation

jitendrapurohit
Copy link
Contributor

Overview

Add user friendly error message on merge error.

Before

When a user tries to merge 2 contacts from an Advanced search screen, the following error is displayed if there is no Supervised rule present on the site.

image

After

Display user-friendly error message -

image

Comments

Gitlab - https://lab.civicrm.org/dev/core/issues/1540

@civibot civibot bot added the master label Jan 20, 2020
@civibot
Copy link

civibot bot commented Jan 20, 2020

(Standard links)

@eileenmcnaughton
Copy link
Contributor

@jitendrapurohit just the grammar - if it's only one rule then IS not ARE

@jitendrapurohit
Copy link
Contributor Author

@eileenmcnaughton Updated 👍

@eileenmcnaughton
Copy link
Contributor

Thanks @jitendrapurohit

@eileenmcnaughton eileenmcnaughton merged commit ea51d0c into civicrm:master Jan 21, 2020
@jitendrapurohit jitendrapurohit deleted the dev-1540 branch January 21, 2020 05:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eileenmcnaughton eileenmcnaughton eileenmcnaughton left review comments

Assignees
No one assigned
Labels
master
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jitendrapurohit @eileenmcnaughton