[Fmsystem-commits] [13449]

[Nelson Guerra]

Revision: 13449
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13449
Author:   nelson224
Date:     2015-06-17 22:28:20 +0000 (Wed, 17 Jun 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-06-17 
22:17:16 UTC (rev 13448)
+++ branches/dev-syncromind/rental/inc/class.uidocument.inc.php 2015-06-17 
22:28:20 UTC (rev 13449)
@@ -67,12 +67,17 @@
                        $editable = phpgw::get_var('editable') == '1' ? true : 
false;
                        
                        //Add context menu columns (actions and labels)
-                       array_walk($rows, array($this, 'add_actions'), 
array($type, isset($contract) ? $contract->has_permission(PHPGW_ACL_EDIT) : 
false, $this->type_of_user, $editable));
-                               
+                       array_walk($rows, array($this, 'add_actions'), 
array($type, isset($contract) ? $contract->has_permission(PHPGW_ACL_EDIT) : 
false, $this->type_of_user, $editable));                             
                        
                        //Build a YUI result from the data
-                       $result_data = array('results' => $rows, 
'total_records' => $result_count);     
-                       return $this->yui_results($result_data, 
'total_records', 'results');
+                       /*$result_data = array('results' => $rows, 
'total_records' => $result_count);   
+                       return $this->yui_results($result_data, 
'total_records', 'results');*/
+                       
+                       $result_data    =   array('results' =>  $rows);
+                       $result_data['total_records']   = $result_count;
+                       $result_data['draw']    = $draw;
+
+                       return $this->jquery_results($result_data);
                }
                
                /**