Merge pull request #12613 from JMAConsulting/core-issue-297

dev/core#297 : fix broken permission 'access my cases and activities'
civicrm · Aug 26, 2018 · 2ae6c17 · 2ae6c17
2 parents 86956fa + bf5990e
commit 2ae6c17
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CRM/Case/BAO/Case.php b/CRM/Case/BAO/Case.php
@@ -676,7 +676,8 @@ public static function getCases($allCases = TRUE, $params = array(), $context =
     $mask = CRM_Core_Action::mask($permissions);
 
     $caseTypes = CRM_Case_PseudoConstant::caseType('name');
-    foreach ($result->fetchAll() as $key => $case) {
+    foreach ($result->fetchAll() as $case) {
+      $key = $case['case_id'];
       $casesList[$key] = array();
       $casesList[$key]['DT_RowId'] = $case['case_id'];
       $casesList[$key]['DT_RowAttr'] = array('data-entity' => 'case', 'data-id' => $case['case_id']);

diff --git a/CRM/Case/Page/AJAX.php b/CRM/Case/Page/AJAX.php
@@ -207,7 +207,7 @@ public static function getCases() {
       'recordsTotal' => $cases['total'],
     );
     unset($cases['total']);
-    $casesDT['data'] = $cases;
+    $casesDT['data'] = array_values($cases);
 
     CRM_Utils_JSON::output($casesDT);
   }