From 834bc8e2a5d782483e20770978328cb902fccb8f Mon Sep 17 00:00:00 2001 From: kurund Date: Tue, 27 May 2014 23:49:02 +0530 Subject: [PATCH] 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 --- CRM/Case/BAO/CaseType.php | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/CRM/Case/BAO/CaseType.php b/CRM/Case/BAO/CaseType.php index ea0cc995a2..0ae9533528 100644 --- 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 .= "\n"; - $xmlFile .= "\n"; - foreach ($params['definition']['activitySets'] as $index => $setVal) { - if ($index == 'activityTypes') { - if (!empty($setVal)) { - $xmlFile .= "\n"; - foreach ($setVal as $values) { - $xmlFile .= "\n"; - foreach ($values as $key => $value) { - $xmlFile .= "<{$key}>{$value}\n"; + foreach ($params['definition']['activitySets'] as $k => $val) { + $xmlFile .= "\n"; + foreach ($val as $index => $setVal) { + if ($index == 'activityTypes') { + if (!empty($setVal)) { + $xmlFile .= "\n"; + foreach ($setVal as $values) { + $xmlFile .= "\n"; + foreach ($values as $key => $value) { + $xmlFile .= "<{$key}>{$value}\n"; + } + $xmlFile .= "\n"; } - $xmlFile .= "\n"; + $xmlFile .= "\n"; } - $xmlFile .= "\n"; + } + else { + $xmlFile .= "<{$index}>{$setVal}\n"; } } - else { - $xmlFile .= "<{$index}>{$setVal}\n"; - } + + $xmlFile .= "\n"; } - $xmlFile .= "\n"; $xmlFile .= "\n"; } @@ -136,7 +139,6 @@ class CRM_Case_BAO_CaseType extends CRM_Case_DAO_CaseType { } $xmlFile .= ''; - $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']); -- 2.25.1