Merge pull request #2291 from colemanw/resources

[civicrm-core.git] / CRM / Admin / Page / Options.php

diff --git a/CRM/Admin/Page/Options.php b/CRM/Admin/Page/Options.php
index 74395c8d5082dac08d6b81732383196b325edb91..de748d0e6cb84ba8747343647d67455a7cf91004 100644 (file)
--- a/CRM/Admin/Page/Options.php
+++ b/CRM/Admin/Page/Options.php
@@ -118,7 +118,7 @@ class CRM_Admin_Page_Options extends CRM_Core_Page_Basic {
           'postal_greeting', 'addressee',
           'communication_style',
           'case_status', 'encounter_medium',
-          'case_type',
+          'case_type', 'payment_instrument'
         )
       )) {
       $this->assign('showIsDefault', TRUE);
@@ -162,14 +162,12 @@ class CRM_Admin_Page_Options extends CRM_Core_Page_Basic {
         ),
         CRM_Core_Action::DISABLE => array(
           'name' => ts('Disable'),
-          'extra' => 'onclick = "enableDisable( %%id%%,\'' . 'CRM_Core_BAO_OptionValue' . '\',\'' . 'enable-disable' . '\' );"',
-          'ref' => 'disable-action',
+          'ref' => 'crm-enable-disable',
           'title' => ts('Disable %1', array(1 => self::$_gName)),
         ),
         CRM_Core_Action::ENABLE => array(
           'name' => ts('Enable'),
-          'extra' => 'onclick = "enableDisable( %%id%%,\'' . 'CRM_Core_BAO_OptionValue' . '\',\'' . 'disable-enable' . '\' );"',
-          'ref' => 'enable-action',
+          'ref' => 'crm-enable-disable',
           'title' => ts('Enable %1', array(1 => self::$_gName)),
         ),
         CRM_Core_Action::DELETE => array(
@@ -228,9 +226,10 @@ class CRM_Admin_Page_Options extends CRM_Core_Page_Basic {
     // retrieve financial account name for the payment instrument page
     if ($gName = "payment_instrument") {
       foreach ($optionValue as  $key => $option) {
-        $optionValue[$key]['financial_account'] = CRM_Financial_BAO_FinancialTypeAccount::getFinancialAccount($key, 'civicrm_option_value');      }
+        $optionValue[$key]['financial_account'] = CRM_Financial_BAO_FinancialTypeAccount::getFinancialAccount($key, 'civicrm_option_value');
+      }
     }
-
+    $this->assign('includeWysiwygEditor', TRUE);
     $this->assign('rows', $optionValue);
   }