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

diff --git a/CRM/Activity/Form/Activity.php b/CRM/Activity/Form/Activity.php
index b082b6af99865f284c29dc44126b2c5f4d0b5ccc..0bb9b9152be3b41a20952f4e4400383f19b6d0fc 100644 (file)
--- 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 356e5e638916ba57ae180f03cecb89d76678a56b..47d54d7b777fabbcae198cad69d0dc67e11dd9dd 100644 (file)
--- 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;
 }