Changeset 3115

Timestamp:

04/13/08 09:35:35 (3 months ago)

Author:

pmjones

Message:

Solar_App_Bookmarks: [CHG] Instead of calling countPages() separately, now uses the 'count_pages' key in fetches.

Files:

• trunk/Solar/App/Bookmarks.php (modified) (6 diffs)

trunk/Solar/App/Bookmarks.php

@@ -377 +377 @@
-        // must be the item owner to edit it
-        $item = $this->_bookmarks->fetchOneById($id, array(
-gings', 'tag
+
-        ));
-        
@@ -546 +546 @@
-            'paging' => $this->_query('paging', 10),
-            'page'   => $this->_query('page', 1),
-
+
+
-        );
-        
-        // get the list of bookmarks
-        $this->list = $this->_bookmarks->fetchAllByTags($tag_list, $params);
-        
-        // get the total pages and row-count
-        $total = $this->_bookmarks->countPagesByTags($tag_list, $params);
-        
-        // flash forward the backlink in case we go to edit, but only if this
@@ -565 +563 @@
-        
-        // assign the list of tags in use
-  
+
-            'order' => 'tags.name'
-        ));
-        
-        // assign everything else for the view
+        $total = $this->list->getPagerInfo();
+        
-        $this->count         = $total['count'];
-        $this->pages         = $total['pages'];
@@ -614 +614 @@
-            'paging' => $this->_query('paging', 10),
-            'page'   => $this->_query('page', 1),
-
+
+
-        );
-        
@@ -620 +621 @@
-        if ($tag_list) {
-            $this->list = $this->_bookmarks->fetchAllByTags($tag_list, $params);
-            $total = $this->_bookmarks->countPagesByTags($tag_list, $params);
-        } else {
-            $this->list = $this->_bookmarks->fetchAll($params);
-            $total = $this->_bookmarks->countPages($params);
-        }
-        
@@ -641 +640 @@
-        
-        // assign remaining view vars
+        $total = $this->list->getPagerInfo();
-        $this->count         = $total['count'];
-        $this->pages         = $total['pages'];