Limit getSummaries to current collection

jjrom · Sep 27, 2024 · 9050d89 · 9050d89
1 parent fecd49d
commit 9050d89
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/app/resto/core/RestoCollection.php b/app/resto/core/RestoCollection.php
@@ -871,11 +871,13 @@ public function addFeatures($body, $params)
     public function getSummaries()
     {
         if ( !isset($this->summaries) ) {
-            $summaries = (new CatalogsFunctions($this->context->dbDriver))->getSummaries(null, $this->id);
+            $summaries = (new CatalogsFunctions($this->context->dbDriver))->getSummaries(null);
             if ( isset($summaries[$this->id]) ) {
                 $this->setSummaries($summaries[$this->id]);
             }
-            else $this->summaries = array();
+            else {
+                $this->summaries = array();
+            }
         }
         return $this->summaries;
     }

diff --git a/app/resto/core/RestoCollections.php b/app/resto/core/RestoCollections.php
@@ -333,7 +333,13 @@ public function getOSDD($model)
     public function getSummaries()
     {
         if ( !isset($this->summaries) ) {
-            $this->summaries = (new CatalogsFunctions($this->context->dbDriver))->getSummaries(null, null);
+            $summaries = (new CatalogsFunctions($this->context->dbDriver))->getSummaries(null);
+            if ( isset($summaries[$this->id]) ) {
+                $this->setSummaries($summaries[$this->id]);
+            }
+            else {
+                $this->summaries = array();
+            }
         }
         return $this->summaries;
     }

diff --git a/app/resto/core/dbfunctions/CatalogsFunctions.php b/app/resto/core/dbfunctions/CatalogsFunctions.php
@@ -489,11 +489,10 @@ public function removeCatalog($catalogId)
      *      )
      * 
      * @param array $types
-     * @param string $collectionId
      * 
      * @return array
      */
-    public function getSummaries($types, $collectionId)
+    public function getSummaries($types)
     {
 
         $summaries = array();
@@ -507,6 +506,8 @@ public function getSummaries($types, $collectionId)
         // First create collection pivots
         $pivots = array();
         for ($i = 0, $ii = count($catalogs); $i < $ii; $i++) {
+
+            // Process only collection
             if ( $catalogs[$i]['rtype'] !== 'collection' ) {
                 continue;
             }