[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [13770]
From: |
Nelson Guerra |
Subject: |
[Fmsystem-commits] [13770] |
Date: |
Tue, 25 Aug 2015 00:11:45 +0000 |
Revision: 13770
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13770
Author: nelson224
Date: 2015-08-25 00:11:44 +0000 (Tue, 25 Aug 2015)
Log Message:
-----------
Modified Paths:
--------------
branches/dev-syncromind/rental/inc/class.uidocument.inc.php
Modified: branches/dev-syncromind/rental/inc/class.uidocument.inc.php
===================================================================
--- branches/dev-syncromind/rental/inc/class.uidocument.inc.php 2015-08-25
00:11:12 UTC (rev 13769)
+++ branches/dev-syncromind/rental/inc/class.uidocument.inc.php 2015-08-25
00:11:44 UTC (rev 13770)
@@ -22,14 +22,42 @@
public function query()
{
+
if($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] > 0)
+ {
+ $user_rows_per_page =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
+ }
+ else {
+ $user_rows_per_page = 10;
+ }
+
+ $search = phpgw::get_var('search');
+ $order = phpgw::get_var('order');
+ $draw = phpgw::get_var('draw', 'int');
+ $columns = phpgw::get_var('columns');
+
+ $start_index = phpgw::get_var('start', 'int',
'REQUEST', 0);
+ $num_of_objects = (phpgw::get_var('length', 'int') <=
0) ? $user_rows_per_page : phpgw::get_var('length', 'int');
+ $sort_field = 'id';
+ switch ($columns[$order[0]['column']]['data']) {
+ case 'type':
+ $sort_field = 'rental_document.type_id';
+ Break;
+ default :
+ $sort_field =
'rental_document.'.$columns[$order[0]['column']]['data'];
+ }
+ $sort_ascending = ($order[0]['dir'] == 'desc') ? false
: true;
+ // Form variables
+ $search_for = $search['value'];
+ $search_type = phpgw::get_var('search_option',
'string', 'REQUEST', 'all');
+
// YUI variables for paging and sorting
- $start_index = phpgw::get_var('startIndex', 'int');
+ /*$start_index = phpgw::get_var('startIndex', 'int');
$num_of_objects = phpgw::get_var('results', 'int',
'GET', 10);
$sort_field = phpgw::get_var('sort');
$sort_ascending = phpgw::get_var('dir') == 'desc' ?
false : true;
// Form variables
$search_for = phpgw::get_var('query');
- $search_type = phpgw::get_var('search_option');
+ $search_type = phpgw::get_var('search_option');*/
// Create an empty result set
$result_objects = array();
$result_count = 0;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [13770],
Nelson Guerra <=