Merge pull request #2296 from njam/model-paging-getItems

Make sure to iterate over all items when instantiating models in paging
cargomedia · Aug 22, 2016 · 2a4a66d · 2a4a66d
2 parents 37ffdbb + 78847ff
commit 2a4a66d
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 22 deletions.
diff --git a/library/CM/Paging/Abstract.php b/library/CM/Paging/Abstract.php
@@ -336,30 +336,10 @@ protected function _processItem($itemRaw) {
         return $itemRaw;
     }
 
-    /**
-     * @param mixed $item
-     * @return boolean Whether the item is matched by any of the registered filters
-     */
-    private function _isFilterMatch($item) {
-        foreach ($this->_filters as $filter) {
-            if (false === $filter($item)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * @return bool
-     */
-    private function _hasFilters() {
-        return count($this->_filters) > 0;
-    }
-
     /**
      * @return array Raw items (might contain more than $this->_pageSize)
      */
-    private function _getItemsRaw() {
+    protected function _getItemsRaw() {
         if ($this->_itemsRaw === null) {
             $this->_itemsRaw = array();
             if ($this->_source) {
@@ -378,6 +358,26 @@ private function _getItemsRaw() {
         return $this->_itemsRaw;
     }
 
+    /**
+     * @param mixed $item
+     * @return boolean Whether the item is matched by any of the registered filters
+     */
+    private function _isFilterMatch($item) {
+        foreach ($this->_filters as $filter) {
+            if (false === $filter($item)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * @return bool
+     */
+    private function _hasFilters() {
+        return count($this->_filters) > 0;
+    }
+
     /**
      * @return int OR null if no pageSize set
      */

diff --git a/library/CM/Paging/ModelAbstract.php b/library/CM/Paging/ModelAbstract.php
@@ -35,7 +35,7 @@ protected function _populateModelList(array $itemsRaw) {
 
     protected function _processItem($itemRaw) {
         if (null === $this->_modelList) {
-            $this->_populateModelList($this->getItemsRaw());
+            $this->_populateModelList($this->_getItemsRaw());
         }
         $index = serialize($itemRaw);
         if (null === ($model = $this->_modelList[$index])) {