CRM-15690 : Merge UI - show text in place of id for gender and employer

diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php
index 4c273c795c258ea0a4842c95680808808979ef59..c76fb0cc21bb4c232bbc3bcf5f5a0a76dfdb479e 100644 (file)
--- 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