[Fmsystem-commits] [13649]

[Nelson Guerra]

Revision: 13649
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13649
Author:   nelson224
Date:     2015-07-13 23:24:12 +0000 (Mon, 13 Jul 2015)
Log Message:
-----------


Modified Paths:
--------------
    branches/dev-syncromind/rental/inc/class.uiunit.inc.php

Modified: branches/dev-syncromind/rental/inc/class.uiunit.inc.php
===================================================================
--- branches/dev-syncromind/rental/inc/class.uiunit.inc.php     2015-07-13 
23:01:13 UTC (rev 13648)
+++ branches/dev-syncromind/rental/inc/class.uiunit.inc.php     2015-07-13 
23:24:12 UTC (rev 13649)
@@ -16,14 +16,18 @@
                
                public function query()
                {
-                       // YUI variables for paging and sorting
-                       $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                 = 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) ? 10 : phpgw::get_var('length', 'int');
+                       $sort_field             = 
($columns[$order[0]['column']]['data']) ? $columns[$order[0]['column']]['data'] 
: 'id'; 
+                       $sort_ascending = ($order[0]['dir'] == 'desc') ? false 
: true;
+                       $search_for     = $search['value'];
+                       $search_type    = phpgw::get_var('search_option', 
'string', 'REQUEST', 'all');
+                       
                        // Create an empty result set
                        $result_objects = array();
                        $result_count = 0;
@@ -55,7 +59,7 @@
                        //
                        $result_data    =   array('results' =>  $rows);
                        $result_data['total_records']   = count($rows);
-                       $result_data['draw']    = 1;
+                       $result_data['draw']    = $draw;
 
                        return $this->jquery_results($result_data);