[Fmsystem-commits] [15407] Pagination

[sigurdne]

Revision: 15407
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15407
Author:   sigurdne
Date:     2016-08-03 08:53:30 +0000 (Wed, 03 Aug 2016)
Log Message:
-----------
Pagination

Modified Paths:
--------------
    trunk/phpgwapi/inc/class.custom_fields.inc.php
    trunk/property/inc/class.boadmin_entity.inc.php
    trunk/property/inc/class.boadmin_location.inc.php

Modified: trunk/phpgwapi/inc/class.custom_fields.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.custom_fields.inc.php      2016-08-03 08:29:22 UTC 
(rev 15406)
+++ trunk/phpgwapi/inc/class.custom_fields.inc.php      2016-08-03 08:53:30 UTC 
(rev 15407)
@@ -1033,10 +1033,10 @@
                 * @return array attributes at location
                 */
                public function find($appname, $location, $start = 0, $query = 
'', $sort = 'ASC',
-                               $order = 'attrib_sort', $allrows = false, 
$inc_choices = false, $filter = array())
+                               $order = 'attrib_sort', $allrows = false, 
$inc_choices = false, $filter = array(), $results = 0)
                {
                        $location_id    = 
$GLOBALS['phpgw']->locations->get_id($appname, $location);
-                       return $this->find2($location_id, $start, $query, 
$sort, $order, $allrows, $inc_choices, $filter);
+                       return $this->find2($location_id, $start, $query, 
$sort, $order, $allrows, $inc_choices, $filter, $results);
                }
 
                /**
@@ -1055,7 +1055,7 @@
                 */
 
                public function find2($location_id, $start = 0, $query = '', 
$sort = 'ASC',
-                               $order = 'attrib_sort', $allrows = false, 
$inc_choices = false, $filter = array())
+                               $order = 'attrib_sort', $allrows = false, 
$inc_choices = false, $filter = array(), $results = 0)
                {
                         
                        $location_id    = (int) $location_id;
@@ -1133,7 +1133,7 @@
                        }
                        else
                        {
-                               $this->_db->limit_query($sql, $start, __LINE__, 
__FILE__);
+                               $this->_db->limit_query($sql, $start, __LINE__, 
__FILE__, $results);
                        }
 
                        $attribs = array();

Modified: trunk/property/inc/class.boadmin_entity.inc.php
===================================================================
--- trunk/property/inc/class.boadmin_entity.inc.php     2016-08-03 08:29:22 UTC 
(rev 15406)
+++ trunk/property/inc/class.boadmin_entity.inc.php     2016-08-03 08:53:30 UTC 
(rev 15407)
@@ -420,7 +420,17 @@
                        {
                                $this->allrows = $data['allrows'];
                        }
-                       $attrib = 
$this->custom->find($this->type_app[$this->type], 
".{$this->type}.{$data['entity_id']}.{$data['cat_id']}", $data['start'], 
$data['query'], $data['sort'], $data['order'], $this->allrows);
+                       $attrib = $this->custom->find(
+                                       $this->type_app[$this->type],
+                                       
".{$this->type}.{$data['entity_id']}.{$data['cat_id']}",
+                                       $data['start'], $data['query'],
+                                       $data['sort'],
+                                       $data['order'],
+                                       $this->allrows,
+                                       false,
+                                       array(),
+                                       (int)$data['results']
+                       );
                        $this->total_records = $this->custom->total_records;
                        return $attrib;
                }

Modified: trunk/property/inc/class.boadmin_location.inc.php
===================================================================
--- trunk/property/inc/class.boadmin_location.inc.php   2016-08-03 08:29:22 UTC 
(rev 15406)
+++ trunk/property/inc/class.boadmin_location.inc.php   2016-08-03 08:53:30 UTC 
(rev 15407)
@@ -285,7 +285,15 @@
                        }
 
                        $attrib = $this->custom->find(
-                               'property', '.location.' . $data['type_id'], 
$data['start'], $data['query'], $data['sort'], $data['order'], $data['allrows']
+                               'property',
+                               '.location.' . $data['type_id'],
+                               $data['start'], $data['query'],
+                               $data['sort'],
+                               $data['order'],
+                               $data['allrows'],
+                               false,
+                               array(),
+                               (int)$data['results']
                        );
                        $this->total_records = $this->custom->total_records;