Changeset 1650

Timestamp:

01/02/07 18:07:39 (22 months ago)

Author:

mbonetti

Message:

fix for #422, improved PaginatedItemList?

Location:

trunk/gregarius

Files:

• cls/items.php (modified) (3 diffs)
• state.php (modified) (1 diff)

trunk/gregarius/cls/items.php

@@ -516 +516 @@
     var $itemsPerPage = 0;
     var $numItems = 0;
-    function PaginatedItemList() { 
+    function PaginatedItemList($itemsPerPage=null) { 
         parent::ItemList(); 
         if (isset($_REQUEST['page'])) {
@@ -523 +523 @@
             $this -> page = 0;
         }
-        
-        $this ->  itemsPerPage = getConfig('rss.output.frontpage.numitems');
+        if ($itemsPerPage === null) {
+            $this ->  itemsPerPage = getConfig('rss.output.frontpage.numitems');
+        } else {
+            $this ->  itemsPerPage = $itemsPerPage;
+        }
     }
     function populate($sqlWhere, $sqlOrder="", $startItem = 0, $itemCount = -1, $hint = ITEM_SORT_HINT_MIXED, $includeDeprecated = false) {
@@ -537 +540 @@
             . $this -> _sqlActualWhere;
         list($this -> numItems) = rss_fetch_row(rss_query($sql));
-        $this -> navigation = new ItemListNavigation($this);
+        
+        if ($this -> numItems >= $this -> itemsPerPage) {
+            $this -> navigation = new ItemListNavigation($this);            
+        }
     }
 }

trunk/gregarius/state.php

@@ -29 +29 @@
 require_once('init.php');
 
-$items = new PaginatedItemList();
+$items = new PaginatedItemList(20);
 $items -> setRenderOptions(IL_NO_COLLAPSE);