[Fmsystem-commits] [7650] controller: adapt paging to preferences

[Sigurd Nes]

Revision: 7650
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7650
Author:   sigurdne
Date:     2011-09-19 21:29:49 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
controller: adapt paging to preferences

Modified Paths:
--------------
    trunk/controller/inc/class.uicommon.inc.php
    trunk/controller/js/yahoo/datatable.js

Modified: trunk/controller/inc/class.uicommon.inc.php
===================================================================
--- trunk/controller/inc/class.uicommon.inc.php 2011-09-19 13:44:09 UTC (rev 
7649)
+++ trunk/controller/inc/class.uicommon.inc.php 2011-09-19 21:29:49 UTC (rev 
7650)
@@ -467,11 +467,11 @@
                                $results['total_records'] = 0;
                                $result['results'] = array();
                        }
-                       
+
                        return array(   
                                'ResultSet' => array(
                                        'totalResultsAvailable' => 
$results['total_records'],
-                                       'recordsReturned'               => 
count($result['results']),
+                                       'recordsReturned'               => 
count($results['results']),
                                        'startIndex' => $results['start'], 
                                        'sortKey' => $results['sort'], 
                                        'sortDir' => $results['dir'], 

Modified: trunk/controller/js/yahoo/datatable.js
===================================================================
--- trunk/controller/js/yahoo/datatable.js      2011-09-19 13:44:09 UTC (rev 
7649)
+++ trunk/controller/js/yahoo/datatable.js      2011-09-19 21:29:49 UTC (rev 
7650)
@@ -80,7 +80,7 @@
         fields: fields,
         metaFields : {
             totalResultsAvailable: "ResultSet.totalResultsAvailable",
-           // recordsReturned: "ResultSet.recordsReturned",
+            recordsReturned: "ResultSet.recordsReturned",
                        startIndex: 'ResultSet.startIndex',
                        sortKey: 'ResultSet.sortKey',
                        sortDir: 'ResultSet.sortDir'
@@ -136,6 +136,7 @@
         oPayload.totalRecords = oResponse.meta.totalResultsAvailable;
                oPayload.pagination = { 
                        rowsPerPage: oResponse.meta.paginationRowsPerPage || 
10, 
+               //      rowsPerPage: oResponse.meta.recordsReturned || 10, 
                        recordOffset: oResponse.meta.startIndex || 0 
            }
                oPayload.sortedBy = {