From ad0121edc3f2ac0dd4bcc09fceb2a9dfe4fdec6e Mon Sep 17 00:00:00 2001 From: yashodha Date: Tue, 11 Aug 2015 18:39:35 +0530 Subject: [PATCH] CRM-16985: Inline edit LABEL on Option Value selector updates NAME instead ---------------------------------------- * CRM-16985: Inline edit LABEL on Option Value selector updates NAME instead https://issues.civicrm.org/jira/browse/CRM-16985 --- CRM/Activity/Form/Activity.php | 2 +- api/v3/OptionValue.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CRM/Activity/Form/Activity.php b/CRM/Activity/Form/Activity.php index b082b6af99..0bb9b9152b 100644 --- a/CRM/Activity/Form/Activity.php +++ b/CRM/Activity/Form/Activity.php @@ -307,7 +307,7 @@ class CRM_Activity_Form_Activity extends CRM_Contact_Form_Task { //Assigning Activity type name if ($this->_activityTypeId) { - $activityTName = CRM_Core_OptionGroup::values('activity_type', FALSE, FALSE, FALSE, 'AND v.value = ' . $this->_activityTypeId, 'name'); + $activityTName = CRM_Core_OptionGroup::values('activity_type', FALSE, FALSE, FALSE, 'AND v.value = ' . $this->_activityTypeId, 'label'); if ($activityTName[$this->_activityTypeId]) { $this->_activityTypeName = $activityTName[$this->_activityTypeId]; $this->assign('activityTName', $activityTName[$this->_activityTypeId]); diff --git a/api/v3/OptionValue.php b/api/v3/OptionValue.php index 356e5e6389..47d54d7b77 100644 --- a/api/v3/OptionValue.php +++ b/api/v3/OptionValue.php @@ -90,7 +90,7 @@ function _civicrm_api3_option_value_create_spec(&$params) { $params['is_active']['api.default'] = 1; //continue to support component $params['component_id']['api.aliases'] = array('component'); - $params['name']['api.aliases'] = array('label'); + // $params['name']['api.aliases'] = array('label'); $params['option_group_id']['api.required'] = TRUE; } -- 2.25.1