[Fmsystem-commits] [13455] class.boresource.inc

[Saul]

Revision: 13455
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13455
Author:   psaul
Date:     2015-06-17 22:48:00 +0000 (Wed, 17 Jun 2015)
Log Message:
-----------
class.boresource.inc

Modified Paths:
--------------
    branches/dev-syncromind/booking/inc/class.boresource.inc.php

Modified: branches/dev-syncromind/booking/inc/class.boresource.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.boresource.inc.php        
2015-06-17 22:47:38 UTC (rev 13454)
+++ branches/dev-syncromind/booking/inc/class.boresource.inc.php        
2015-06-17 22:48:00 UTC (rev 13455)
@@ -116,21 +116,32 @@
                public function populate_grid_data($menuaction)
                {
                        $resources = $this->read();
+            
                        foreach($resources['results'] as &$resource)
                        {
                                $resource['link']        = 
$this->link(array('menuaction' => $menuaction, 'id' => $resource['id']));
                                $resource['type']                = 
lang($resource['type']);
                                $resource['full_name'] = 
$resource['building_name'] . ' / ' . $resource['name'];
                        }
-                       $data = array(
-                                'ResultSet' => array(
-                                       'totalResultsAvailable' => 
$resources['total_records'], 
-                                       'startIndex' => $resources['start'], 
-                                       'sortKey' => $resources['sort'], 
-                                       'sortDir' => $resources['dir'], 
-                                       'Result' => $resources['results']
-                               )
+//                     $data = array(
+//                              'ResultSet' => array(
+//                                     'totalResultsAvailable' => 
$resources['total_records'], 
+//                                     'startIndex' => $resources['start'], 
+//                                     'sortKey' => $resources['sort'], 
+//                                     'sortDir' => $resources['dir'], 
+//                                     'Result' => $resources['results']
+//                             )
+//                     );
+            
+            $data = array(
+                                       'total_records' => 
$resources['total_records'], 
+                                       'start' => $resources['start'], 
+                                       'sort' => $resources['sort'], 
+                                       'dir' => $resources['dir'], 
+                                       'results' => $resources['results']
                        );
+                        
+//            echo '<pre>'; print_r($rpta); echo '</pre>'; exit('saul');
                        return $data;
                }