[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [15077] Syncromind: Merge 14936:15027 from trunk
From: |
sigurdne |
Subject: |
[Fmsystem-commits] [15077] Syncromind: Merge 14936:15027 from trunk |
Date: |
Fri, 13 May 2016 12:06:34 +0000 (UTC) |
Revision: 15077
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15077
Author: sigurdne
Date: 2016-05-13 12:06:33 +0000 (Fri, 13 May 2016)
Log Message:
-----------
Syncromind: Merge 14936:15027 from trunk
Modified Paths:
--------------
branches/dev-syncromind-2/property/inc/class.uibudget.inc.php
Modified: branches/dev-syncromind-2/property/inc/class.uibudget.inc.php
===================================================================
--- branches/dev-syncromind-2/property/inc/class.uibudget.inc.php
2016-05-13 12:06:30 UTC (rev 15076)
+++ branches/dev-syncromind-2/property/inc/class.uibudget.inc.php
2016-05-13 12:06:33 UTC (rev 15077)
@@ -601,6 +601,7 @@
$order = phpgw::get_var('order');
$draw = phpgw::get_var('draw', 'int');
$columns = phpgw::get_var('columns');
+ $export = phpgw::get_var('export', 'bool');
$order_field = '';
switch ($columns[$order[0]['column']]['data'])
@@ -621,12 +622,12 @@
'query' => $search['value'],
'order' => $order_field,
'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;
}
@@ -765,6 +766,7 @@
$order = phpgw::get_var('order');
$draw = phpgw::get_var('draw', 'int');
$columns = phpgw::get_var('columns');
+ $export = phpgw::get_var('export', 'bool');
$order_field = '';
switch ($columns[$order[0]['column']]['data'])
@@ -785,12 +787,12 @@
'query' => $search['value'],
'order' => $order_field,
'sort' => $order[0]['dir'],
- 'allrows' => phpgw::get_var('length', 'int') ==
-1
+ 'allrows' => phpgw::get_var('length', 'int') ==
-1 || $export
);
$values = $this->bo->read_basis($params);
- if (phpgw::get_var('export', 'bool'))
+ if ($export)
{
return $values;
}
@@ -909,6 +911,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),
@@ -916,12 +919,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
);
$location_list = $this->bo->read_obligations($params);
- if (phpgw::get_var('export', 'bool'))
+ if ($export)
{
return $location_list;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [15077] Syncromind: Merge 14936:15027 from trunk,
sigurdne <=