fixes for create mode - case type api, CRM-14725

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

diff --git a/CRM/Case/BAO/CaseType.php b/CRM/Case/BAO/CaseType.php
index ea0cc995a226806e93808eb231d67963e6645d95..0ae9533528b26f212ea2f7b3393093bd92d5b647 100644 (file)
--- a/CRM/Case/BAO/CaseType.php
+++ b/CRM/Case/BAO/CaseType.php
@@ -99,27 +99,30 @@ class CRM_Case_BAO_CaseType extends CRM_Case_DAO_CaseType {
 
     if (!empty($params['definition']['activitySets'])) {
       $xmlFile .= "<ActivitySets>\n";
-      $xmlFile .= "<ActivitySet>\n";
-      foreach ($params['definition']['activitySets'] as $index => $setVal) {
-        if ($index == 'activityTypes') {
-          if (!empty($setVal)) {
-            $xmlFile .= "<ActivityTypes>\n";
-            foreach ($setVal as $values) {
-              $xmlFile .= "<ActivityType>\n";
-              foreach ($values as $key => $value) {
-                $xmlFile .= "<{$key}>{$value}</{$key}>\n";
+      foreach ($params['definition']['activitySets'] as $k => $val) {
+        $xmlFile .= "<ActivitySet>\n";
+        foreach ($val as $index => $setVal) {
+          if ($index == 'activityTypes') {
+            if (!empty($setVal)) {
+              $xmlFile .= "<ActivityTypes>\n";
+              foreach ($setVal as $values) {
+                $xmlFile .= "<ActivityType>\n";
+                foreach ($values as $key => $value) {
+                  $xmlFile .= "<{$key}>{$value}</{$key}>\n";
+                }
+                $xmlFile .= "</ActivityType>\n";
               }
-              $xmlFile .= "</ActivityType>\n";
+              $xmlFile .= "</ActivityTypes>\n";
             }
-            $xmlFile .= "</ActivityTypes>\n";
+          }
+          else {
+            $xmlFile .= "<{$index}>{$setVal}</{$index}>\n";
           }
         }
-        else {
-          $xmlFile .= "<{$index}>{$setVal}</{$index}>\n";
-        }
+
+        $xmlFile .= "</ActivitySet>\n";
       }
 
-      $xmlFile .= "</ActivitySet>\n";
       $xmlFile .= "</ActivitySets>\n";
     }
 
@@ -136,7 +139,6 @@ class CRM_Case_BAO_CaseType extends CRM_Case_DAO_CaseType {
     }
 
     $xmlFile .= '</CaseType>';
-
     $params['definition'] = $xmlFile;
   }
 
@@ -166,7 +168,7 @@ class CRM_Case_BAO_CaseType extends CRM_Case_DAO_CaseType {
 
     // set activity sets
     $activitySets = json_decode(json_encode($xml->ActivitySets), TRUE);
-    foreach($activitySets as $key => $value) {
+    foreach ($activitySets as $key => $value) {
       $caseType['values'][0]['definition']['activitySets'] = array($key => $value);
       $caseType['values'][0]['definition']['activitySets'][$key]['activityTypes'] = $activitySets['ActivitySet']['ActivityTypes']['ActivityType'];
       unset($caseType['values'][0]['definition']['activitySets'][$key]['ActivityTypes']);