Merge pull request #2291 from colemanw/resources

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

diff --git a/CRM/Admin/Page/OptionValue.php b/CRM/Admin/Page/OptionValue.php
index fe5e2c3b036f93f6e8c2dad78828bc069cba4ec7..7f28c87ce9aaef0ae4962c086c9e9c861edfcd79 100644 (file)
--- a/CRM/Admin/Page/OptionValue.php
+++ b/CRM/Admin/Page/OptionValue.php
@@ -46,7 +46,7 @@ class CRM_Admin_Page_OptionValue extends CRM_Core_Page_Basic {
    */
   static $_links = NULL;
 
-  static $_gid = NULL;
+  protected $_gid = NULL;
 
   /**
    * The option group name
@@ -54,7 +54,7 @@ class CRM_Admin_Page_OptionValue extends CRM_Core_Page_Basic {
    * @var string
    * @static
    */
-  static $_gName = NULL;
+  protected $_gName = NULL;
 
   /**
    * Get BAO Name
@@ -81,14 +81,12 @@ class CRM_Admin_Page_OptionValue 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 Option Value'),
         ),
         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 Option Value'),
         ),
         CRM_Core_Action::DELETE => array(
@@ -149,6 +147,7 @@ class CRM_Admin_Page_OptionValue extends CRM_Core_Page_Basic {
    * @static
    */
   function browse() {
+    CRM_Core_Resources::singleton()->addScriptFile('civicrm', 'js/crm.livePage.js');
     $dao = new CRM_Core_DAO_OptionValue();
 
     $dao->option_group_id = $this->_gid;
@@ -205,7 +204,12 @@ class CRM_Admin_Page_OptionValue extends CRM_Core_Page_Basic {
       }
 
       $optionValue[$dao->id]['action'] = CRM_Core_Action::formLink(self::links(), $action,
-        array('id' => $dao->id, 'gid' => $this->_gid)
+        array('id' => $dao->id, 'gid' => $this->_gid),
+        ts('more'),
+        FALSE,
+        'optionValue.admin.actions',
+        'optionValue',
+        $dao->id
       );
     }