Merge pull request #134 from compucorp/FEMSSPRT-44-fix-activity-report

FEMSSPRT-44: Fix Activity Report Problem on Loading
compucorp · Jun 17, 2021 · 71e16ee · 71e16ee
2 parents 3d393ac + 14a8511
commit 71e16ee
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/CRM/PivotData/AbstractData.php b/CRM/PivotData/AbstractData.php
@@ -76,7 +76,7 @@ abstract class CRM_PivotData_AbstractData implements CRM_PivotData_DataInterface
   /**
    * Name of data group.
    *
-   * @var string 
+   * @var string
    */
   protected $name = NULL;
 
@@ -364,7 +364,6 @@ protected function getPaginatedResults(array $apiParams, $offset = 0, $multiValu
     $apiParams['options']['offset'] = $offset;
     $entities = civicrm_api3($this->apiEntityName, 'get', $apiParams);
     $formattedEntities = $this->formatResult($entities['values']);
-    $indexes = [];
 
     unset($entities);
 
@@ -376,12 +375,9 @@ protected function getPaginatedResults(array $apiParams, $offset = 0, $multiValu
         break;
       }
 
-      $index = $split['info']['index'];
-      if (!in_array($index, array_keys($indexes))) {
+      if ($split['info']['index'] !== $index) {
         $page = 0;
-      }
-      else {
-        $page = $indexes[$index];
+        $index = $split['info']['index'];
       }
 
       $result[] = new CRM_PivotData_DataPage($split['data'], $index, $page++, $split['info']['nextOffset'], $split['info']['multiValuesOffset']);
@@ -392,7 +388,6 @@ protected function getPaginatedResults(array $apiParams, $offset = 0, $multiValu
 
       $offset = $split['info']['nextOffset'];
       $multiValuesOffset =  $split['info']['multiValuesOffset'];
-      $indexes[$index] = $page;
     }
 
     return $result;