From 61fbad0d69d51d9b8bacdb4ef72cd4520028f256 Mon Sep 17 00:00:00 2001 From: Dave Greenberg Date: Thu, 5 Jun 2014 14:35:52 -0700 Subject: [PATCH] CRM-14801 - fix notices and fix code so option_values for Address Provider are passed to parent buildQuickForm class. ---------------------------------------- * CRM-14801: https://issues.civicrm.org/jira/browse/CRM-14801 --- CRM/Admin/Form/Preferences/Address.php | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/CRM/Admin/Form/Preferences/Address.php b/CRM/Admin/Form/Preferences/Address.php index 51a036ec55..1f6b0cb80d 100644 --- a/CRM/Admin/Form/Preferences/Address.php +++ b/CRM/Admin/Form/Preferences/Address.php @@ -41,6 +41,9 @@ class CRM_Admin_Form_Preferences_Address extends CRM_Admin_Form_Preferences { CRM_Utils_System::setTitle(ts('Settings - Addresses')); + // Address Standardization + $addrProviders = array( + '' => '- select -') + CRM_Core_SelectValues::addressProvider(); $this->_varNames = array( CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME => @@ -67,6 +70,8 @@ class CRM_Admin_Form_Preferences_Address extends CRM_Admin_Form_Preferences { array( 'address_standardization_provider' => array( 'html_type' => 'select', + 'title' => ts('Provider'), + 'option_values' => $addrProviders, 'weight' => 4, ), 'address_standardization_userid' => array( @@ -141,15 +146,6 @@ class CRM_Admin_Form_Preferences_Address extends CRM_Admin_Form_Preferences { public function buildQuickForm() { $this->applyFilter('__ALL__', 'trim'); - // Address Standardization - $addrProviders = CRM_Core_SelectValues::addressProvider(); - $this->addElement('select', - 'address_standardization_provider', - ts('Address Provider'), - array( - '' => '- select -') + $addrProviders - ); - $this->addFormRule(array('CRM_Admin_Form_Preferences_Address', 'formRule')); //get the tokens for Mailing Label field -- 2.25.1