CRM-13863 - Consolidate livePage.js handling in parent page class

[civicrm-core.git] / CRM / Financial / Page / FinancialType.php

diff --git a/CRM/Financial/Page/FinancialType.php b/CRM/Financial/Page/FinancialType.php
index 3559b4d90c7d6dea4379e53997c1c15b9ae23fc5..55d93e7d6687694791d1d742ba4d8cf12e569ad5 100644 (file)
--- a/CRM/Financial/Page/FinancialType.php
+++ b/CRM/Financial/Page/FinancialType.php
@@ -37,6 +37,8 @@
  * Page for displaying list of financial types
  */
 class CRM_Financial_Page_FinancialType extends CRM_Core_Page_Basic {
+
+  public $useLivePageJS = TRUE;
   /**
    * The action links that we need to display for the browse screen
    *
@@ -76,14 +78,12 @@ class CRM_Financial_Page_FinancialType extends CRM_Core_Page_Basic {
         ),
         CRM_Core_Action::DISABLE => array(
           'name'  => ts('Disable'),
-          'extra' => 'onclick = "enableDisable( %%id%%,\''. 'CRM_Financial_BAO_FinancialType' . '\',\'' . 'enable-disable' . '\' );"',
-          'ref'   => 'disable-action',
+          'ref'   => 'crm-enable-disable',
           'title' => ts('Disable Financial Type'),
         ),
         CRM_Core_Action::ENABLE  => array(
           'name'  => ts('Enable'),
-          'extra' => 'onclick = "enableDisable( %%id%%,\''. 'CRM_Financial_BAO_FinancialType' . '\',\'' . 'disable-enable' . '\' );"',
-          'ref'   => 'enable-action',
+          'ref'   => 'crm-enable-disable',
           'title' => ts('Enable Financial Type'),
         ),
         CRM_Core_Action::DELETE  => array(
@@ -152,7 +152,7 @@ class CRM_Financial_Page_FinancialType extends CRM_Core_Page_Basic {
       CRM_Financial_BAO_FinancialTypeAccount::retrieve($params, CRM_Core_DAO::$_nullArray, $financialAccountIds);
 
       foreach( $financialAccountIds as $key => $values){
-        if (CRM_Utils_Array::value($values['financial_account_id'], $financialAccounts)) {
+        if (!empty($financialAccounts[$values['financial_account_id']])) {
           $financialAccountId[$values['financial_account_id']] = CRM_Utils_Array::value(
             $values['financial_account_id'], $financialAccounts );
         }