From 4f88c9cf9dae158d47b64488ff1008cc7195202b Mon Sep 17 00:00:00 2001 From: CiviCRM Date: Fri, 5 Dec 2014 15:39:50 +0530 Subject: [PATCH] CRM-15690 : Merge UI - show text in place of id for gender and employer --- CRM/Dedupe/Merger.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php index 4c273c795c..c76fb0cc21 100644 --- a/CRM/Dedupe/Merger.php +++ b/CRM/Dedupe/Merger.php @@ -869,6 +869,8 @@ INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m $rows = $elements = $relTableElements = $migrationInfo = array(); + $genders = CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'gender_id'); + foreach ($diffs['contact'] as $field) { foreach (array('main', 'other') as $moniker) { $contact = &$$moniker; @@ -904,6 +906,12 @@ INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m $value = CRM_Utils_Array::value('suffix_id', $contact); $field = 'suffix_id'; } + elseif ($field == 'gender_id' && !empty($value)) { + $label = $genders[$value]; + } + elseif ($field == 'current_employer_id' && !empty($value)) { + $label = "$value (" . CRM_Contact_BAO_Contact::displayName($value) . ")"; + } $rows["move_$field"][$moniker] = $label; if ($moniker == 'other') { //CRM-14334 -- 2.25.1