[Fmsystem-commits] [13363] class.uialarm.inc

[Saul]

Revision: 13363
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13363
Author:   psaul
Date:     2015-06-04 22:38:04 +0000 (Thu, 04 Jun 2015)
Log Message:
-----------
class.uialarm.inc

Modified Paths:
--------------
    branches/dev-syncromind/property/inc/class.uialarm.inc.php

Modified: branches/dev-syncromind/property/inc/class.uialarm.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uialarm.inc.php  2015-06-04 
22:37:44 UTC (rev 13362)
+++ branches/dev-syncromind/property/inc/class.uialarm.inc.php  2015-06-04 
22:38:04 UTC (rev 13363)
@@ -825,12 +825,21 @@
                        $draw       = phpgw::get_var('draw', 'int');
                        $columns    = phpgw::get_var('columns');
             
+            switch($columns[$order[0]['column']]['data'])
+                       {
+                               case 'next_run':
+                                       $order_field = 'next';
+                                       break;
+                               default:
+                                       $order_field = 
$columns[$order[0]['column']]['data'];
+                       }
+            
             $params = array
                 (
                     'start'             => 
phpgw::get_var('start','int','REQUEST',0),
                     'results'           => phpgw::get_var('length', 'int', 
'REQUEST', 0),
                     'query'             => $search['value'],
-                    'order'             => 
$columns[$order[0]['column']]['data'],
+                    'order'             => $order_field,
                     'sort'              => $order[0]['dir'],
                     'filter'            => $this->filter,
                     'id'                =>'%',
@@ -839,6 +848,8 @@
            
             $list = $this->bo->read($params);
             
+//            echo '<pre>'; print_r($list); echo '</pre>';
+            
             while (is_array($list) && list($id,$alarm) = each($list))
                        {
                                if(is_array($alarm['times']))