Merge pull request #3679 from yashodha/CRM-14951

[civicrm-core.git] / api / v3 / PriceSet.php

diff --git a/api/v3/PriceSet.php b/api/v3/PriceSet.php
index 6916b13e5c1a2380040e1c50f209c371e8c152af..4e4b0aa5a6cdcc878c455b3b0752165b3a91006a 100644 (file)
--- a/api/v3/PriceSet.php
+++ b/api/v3/PriceSet.php
@@ -2,9 +2,9 @@
 /*
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.3                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -57,7 +57,7 @@ function civicrm_api3_price_set_create($params) {
     foreach ($entityId as $eid) {
       $eid = (int) trim($eid);
       if ($eid) {
-        CRM_Price_BAO_Set::addTo($params['entity_table'], $eid, $result['id']);
+        CRM_Price_BAO_PriceSet::addTo($params['entity_table'], $eid, $result['id']);
       }
     }
   }
@@ -71,6 +71,7 @@ function civicrm_api3_price_set_create($params) {
  * @param array $params array or parameters determined by getfields
  */
 function _civicrm_api3_price_set_create_spec(&$params) {
+  $params['title']['api.required'] = TRUE;
 }
 
 /**
@@ -84,10 +85,15 @@ function _civicrm_api3_price_set_create_spec(&$params) {
  * @access public
  */
 function civicrm_api3_price_set_get($params) {
+  // hack to make getcount work. - not sure the best approach here
+  // as creating an alternate getcount function also feels a bit hacky
+  if(isset($params['options'])  && isset($params['options']['is_count'])) {
+    return _civicrm_api3_basic_get(_civicrm_api3_get_BAO(__FUNCTION__), $params);
+  }
   $result = _civicrm_api3_basic_get(_civicrm_api3_get_BAO(__FUNCTION__), $params, FALSE);
   // Fetch associated entities
   foreach ($result as &$item) {
-    $item['entity'] = CRM_Price_BAO_Set::getUsedBy($item['id'], 'entity');
+    $item['entity'] = CRM_Price_BAO_PriceSet::getUsedBy($item['id'], 'entity');
   }
   return civicrm_api3_create_success($result, $params);
 }