api and generated data fixes, CRM-14725

----------------------------------------
* CRM-14725: Edit Case Type - Use AJAX load/save
  https://issues.civicrm.org/jira/browse/CRM-14725

diff --git a/api/v3/CaseType.php b/api/v3/CaseType.php
index 859b7510bb9b034a0ebaf8acfc7d718e67508b93..2965dca387d0baf12a062505ff92d6213ae87348 100644 (file)
--- a/api/v3/CaseType.php
+++ b/api/v3/CaseType.php
@@ -72,7 +72,7 @@ function civicrm_api3_case_type_get($params) {
   $caseTypes = _civicrm_api3_basic_get(_civicrm_api3_get_BAO(__FUNCTION__), $params);
 
   // format case type, to fetch xml definition
-  return _civicrm_api3_case_type_get_formatResult($params, $caseTypes);
+  return _civicrm_api3_case_type_get_formatResult($caseTypes);
 }
 
 /**

diff --git a/xml/templates/case_sample.tpl b/xml/templates/case_sample.tpl
index e069bbdbf484d73f8317d1f8c9bceb07d4975b58..ec6997a92d356a99ce871232a829a95342a9521f 100644 (file)
--- a/xml/templates/case_sample.tpl
+++ b/xml/templates/case_sample.tpl
@@ -15,8 +15,8 @@ SELECT @caseCompId := id FROM `civicrm_component` where `name` like 'CiviCase';
 SELECT @max_wt  :=  COALESCE ( max(weight), 0 ) from civicrm_case_type;
 
 INSERT IGNORE INTO `civicrm_case_type` (  `title`, `name`, `description`, `weight`, `is_reserved`, `is_active`) VALUES
-  ('{ts}Housing Support{/ts}', 'housing_support', '{ts}Help homeless individuals obtain temporary and long-term housing{/ts}', @max_wt + 1, 0, 1),
-  ('{ts}Adult Day Care Referral{/ts}', 'adult_day_care_referral', '{ts}Arranging adult day care for senior individuals{/ts}', @max_wt + 2, 0, 1);
+  ('{ts}Housing Support{/ts}', 'HousingSupport', '{ts}Help homeless individuals obtain temporary and long-term housing{/ts}', @max_wt + 1, 0, 1),
+  ('{ts}Adult Day Care Referral{/ts}', 'AdultDayCareReferral', '{ts}Arranging adult day care for senior individuals{/ts}', @max_wt + 2, 0, 1);
 
 -- /*******************************************************
 -- *