X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FAdmin%2FPage%2FOptions.php;h=efdba99f13c0bb76982a9ffd0613f4fa3a581c02;hb=e0d8d524696e21fcdf379daae3d65fc7ad7523f0;hp=dfe1102de17520018c919fee4da5d5ecf1fb52c5;hpb=61920c359ebfdc6c5b8bff501bbd420c0f530550;p=civicrm-core.git diff --git a/CRM/Admin/Page/Options.php b/CRM/Admin/Page/Options.php index dfe1102de1..efdba99f13 100644 --- a/CRM/Admin/Page/Options.php +++ b/CRM/Admin/Page/Options.php @@ -1,9 +1,9 @@ ts('Option Groups'), 'url' => CRM_Utils_System::url('civicrm/admin/options', 'reset=1'), @@ -132,7 +143,7 @@ class CRM_Admin_Page_Options extends CRM_Core_Page_Basic { 'communication_style', 'case_status', 'encounter_medium', 'case_type', 'payment_instrument', - 'soft_credit_type' + 'soft_credit_type', 'website_type' ) )) { $this->assign('showIsDefault', TRUE); @@ -145,6 +156,7 @@ class CRM_Admin_Page_Options extends CRM_Core_Page_Basic { if (self::$_gName == 'participant_role') { $this->assign('showCounted', TRUE); } + $this->assign('isLocked', self::$_isLocked); $config = CRM_Core_Config::singleton(); if (self::$_gName == 'activity_type') { $this->assign('showComponent', TRUE); @@ -228,7 +240,6 @@ class CRM_Admin_Page_Options extends CRM_Core_Page_Basic { if (!self::$_gName) { return parent::browse(); } - CRM_Core_Resources::singleton()->addScriptFile('civicrm', 'js/crm.livePage.js'); $groupParams = array('name' => self::$_gName); $optionValue = CRM_Core_OptionValue::getRows($groupParams, $this->links(), 'component_id,weight'); $gName = self::$_gName; @@ -246,7 +257,6 @@ class CRM_Admin_Page_Options extends CRM_Core_Page_Basic { $optionValue[$key]['financial_account'] = CRM_Financial_BAO_FinancialTypeAccount::getFinancialAccount($key, 'civicrm_option_value'); } } - $this->assign('includeWysiwygEditor', TRUE); $this->assign('rows', $optionValue); } @@ -271,6 +281,8 @@ class CRM_Admin_Page_Options extends CRM_Core_Page_Basic { /** * Get user context. * + * @param null $mode + * * @return string user context. */ function userContext($mode = NULL) {