[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [15080] Syncromind: Merge 14936:15027 from trunk
From: |
sigurdne |
Subject: |
[Fmsystem-commits] [15080] Syncromind: Merge 14936:15027 from trunk |
Date: |
Fri, 13 May 2016 12:06:42 +0000 (UTC) |
Revision: 15080
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15080
Author: sigurdne
Date: 2016-05-13 12:06:42 +0000 (Fri, 13 May 2016)
Log Message:
-----------
Syncromind: Merge 14936:15027 from trunk
Modified Paths:
--------------
branches/dev-syncromind-2/property/inc/class.uidocument.inc.php
Modified: branches/dev-syncromind-2/property/inc/class.uidocument.inc.php
===================================================================
--- branches/dev-syncromind-2/property/inc/class.uidocument.inc.php
2016-05-13 12:06:39 UTC (rev 15079)
+++ branches/dev-syncromind-2/property/inc/class.uidocument.inc.php
2016-05-13 12:06:42 UTC (rev 15080)
@@ -126,6 +126,7 @@
$order = phpgw::get_var('order');
$draw = phpgw::get_var('draw', 'int');
$columns = phpgw::get_var('columns');
+ $export = phpgw::get_var('export', 'bool');
$params = array(
'start' => phpgw::get_var('start', 'int',
'REQUEST', 0),
@@ -133,12 +134,12 @@
'query' => $search['value'],
'order' =>
$columns[$order[0]['column']]['data'],
'sort' => $order[0]['dir'],
- 'allrows' => phpgw::get_var('length', 'int') ==
-1,
+ 'allrows' => phpgw::get_var('length', 'int') ==
-1 || $export,
);
$values = $this->bo->read($params);
- if (phpgw::get_var('export', 'bool'))
+ if ($export)
{
return $values;
}
@@ -343,6 +344,7 @@
$order = phpgw::get_var('order');
$draw = phpgw::get_var('draw', 'int');
$columns = phpgw::get_var('columns');
+ $export = phpgw::get_var('export', 'bool');
$location_code = phpgw::get_var('location_code');
if ($this->query_location)
@@ -356,13 +358,13 @@
'query' => $search['value'],
'order' =>
$columns[$order[0]['column']]['data'],
'sort' => $order[0]['dir'],
- 'allrows' => phpgw::get_var('length', 'int') ==
-1,
+ 'allrows' => phpgw::get_var('length', 'int') ==
-1 || $export,
'location_code' => $location_code
);
$values = $this->bo->read_at_location($params);
- if (phpgw::get_var('export', 'bool'))
+ if ($export)
{
return $values;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [15080] Syncromind: Merge 14936:15027 from trunk,
sigurdne <=