[Fmsystem-commits] [14694] property: allrows on tts

[Sigurd Nes]

Revision: 14694
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14694
Author:   sigurdne
Date:     2016-02-03 21:53:52 +0000 (Wed, 03 Feb 2016)
Log Message:
-----------
property: allrows on tts

Modified Paths:
--------------
    branches/dev-syncromind/property/inc/class.sotts.inc.php
    branches/dev-syncromind/property/inc/class.uitts.inc.php

Modified: branches/dev-syncromind/property/inc/class.sotts.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.sotts.inc.php    2016-02-03 
21:50:49 UTC (rev 14693)
+++ branches/dev-syncromind/property/inc/class.sotts.inc.php    2016-02-03 
21:53:52 UTC (rev 14694)
@@ -122,8 +122,9 @@
                        $cat_id = isset($data['cat_id']) && $data['cat_id'] ? 
(int)$data['cat_id'] : 0;
                        $district_id = isset($data['district_id']) && 
$data['district_id'] ? (int)$data['district_id'] : 0;
                        $part_of_town_id = isset($data['part_of_town_id']) && 
$data['part_of_town_id'] ? (int)$data['part_of_town_id'] : 0;
-                       $allrows = isset($data['allrows']) ? $data['allrows'] : 
'';
                        $start_date = isset($data['start_date']) && 
$data['start_date'] ? (int)$data['start_date'] : 0;
+                       $results = isset($data['results']) && $data['results'] 
? (int)$data['results'] : 0;
+                       $allrows = $results == -1 ? true : false;
                        $end_date = isset($data['end_date']) && 
$data['end_date'] ? (int)$data['end_date'] : 0;
                        $external = isset($data['external']) ? 
$data['external'] : '';
                        $dry_run = isset($data['dry_run']) ? $data['dry_run'] : 
'';
@@ -686,7 +687,7 @@
                        {
                                if(!$allrows)
                                {
-                                       $this->db->limit_query($main_sql, 
$start, __LINE__, __FILE__);
+                                       $this->db->limit_query($main_sql, 
$start, __LINE__, __FILE__, $results);
                                }
                                else
                                {

Modified: branches/dev-syncromind/property/inc/class.uitts.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uitts.inc.php    2016-02-03 
21:50:49 UTC (rev 14693)
+++ branches/dev-syncromind/property/inc/class.uitts.inc.php    2016-02-03 
21:53:52 UTC (rev 14694)
@@ -128,7 +128,7 @@
                                'sort' => $order[0]['dir'],
                                'dir' => $order[0]['dir'],
                                'cat_id' => phpgw::get_var('cat_id', 'int', 
'REQUEST', 0),
-                               'allrows' => phpgw::get_var('length', 'int') == 
-1,
+                               'allrows' => phpgw::get_var('length', 'int') == 
-1 ? true : false,
                                'status_id' => $this->bo->status_id,
                                'user_id' => $this->bo->user_id,
                                'reported_by' => $this->bo->reported_by,