From a810c9da49380e846aab079b94b6975fc7487ac5 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Wed, 12 Jun 2013 16:05:20 -0700 Subject: [PATCH] Test fix - get rid of exta api.aliases --- CRM/Contact/Page/View/Summary.php | 2 +- api/v3/Generic.php | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/CRM/Contact/Page/View/Summary.php b/CRM/Contact/Page/View/Summary.php index 94154ef9f9..35f1ed021b 100644 --- a/CRM/Contact/Page/View/Summary.php +++ b/CRM/Contact/Page/View/Summary.php @@ -179,7 +179,7 @@ class CRM_Contact_Page_View_Summary extends CRM_Contact_Page_View { CRM_Utils_Array::lookupValue($val, 'location_type', CRM_Core_PseudoConstant::get('CRM_Core_DAO_Address', 'location_type_id', array('labelColumn' => 'display_name')), FALSE); if (!CRM_Utils_Array::value('skip', $value)) { $daoName = $value['daoName']; - $pseudoConst = $daoName::buildOptions($value['fieldName'], 'view'); + $pseudoConst = $daoName::buildOptions($value['fieldName'], 'get'); CRM_Utils_Array::lookupValue($val, $value['id'], $pseudoConst, FALSE); } } diff --git a/api/v3/Generic.php b/api/v3/Generic.php index 13efcc119c..1e17e92079 100644 --- a/api/v3/Generic.php +++ b/api/v3/Generic.php @@ -245,10 +245,6 @@ function _civicrm_api3_generic_get_metadata_options(&$metadata, $entity, $fieldn return; } - if(substr($fieldname, -3) == '_id'){ - $metadata[$fieldname]['api.aliases'][] = substr($fieldname, 0, -3); - } - if (!empty($metadata[$fieldname]['options']) || !in_array($fieldname, $fieldsToResolve)) { return; } -- 2.25.1