[Fmsystem-commits] [12592]

[Nelson Guerra]

Revision: 12592
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12592
Author:   nelson224
Date:     2015-01-13 17:06:02 +0000 (Tue, 13 Jan 2015)
Log Message:
-----------


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

Modified: branches/dev-syncromind/property/inc/class.uilookup.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uilookup.inc.php 2015-01-13 
17:05:04 UTC (rev 12591)
+++ branches/dev-syncromind/property/inc/class.uilookup.inc.php 2015-01-13 
17:06:02 UTC (rev 12592)
@@ -1749,9 +1749,15 @@
                                                $params = array(
                                                                                
'key' => $uicols['name'][$k],
                                                                                
'label' => $uicols['descr'][$k],
-                                                                               
'sortable' => ($uicols['sortable'][$k]) ? true : false,
+                                                                               
'sortable' => false,
                                                                                
'hidden' => ($uicols['input_type'][$k] == 'hidden') ? true : false
                                                                        );
+                                               
+                                               if ($uicols['name'][$k]=='loc1' 
|| $uicols['name'][$k]=='num')
+                                               {
+                                                       $params['sortable']     
= true;
+                                               }
+                               
                                                array_push ($entity_def, 
$params);
 
                                                if ($uicols['input_type'][$k] 
!= 'hidden')
@@ -1829,6 +1835,7 @@
                                                        'menuaction'            
=> 'property.uilookup.entity',
                                                        'second_display'        
=> 1,
                                                        'entity_id'             
        => $this->entity_id,
+                                                       'cat_id'                
        => $this->cat_id,
                                                        'phpgw_return_as'       
=> 'json'
                                        )),
                                        'allrows'       => true,
@@ -1874,10 +1881,15 @@
                                $params = array(
                                                                'key' => 
$uicols['name'][$k],
                                                                'label' => 
$uicols['descr'][$k],
-                                                               'sortable' => 
($uicols['sortable'][$k]) ? true : false,
+                                                               'sortable' => 
false,
                                                                'hidden' => 
($uicols['input_type'][$k] == 'hidden') ? true : false
                                                        );
-
+                               
+                               if ($uicols['name'][$k]=='loc1' || 
$uicols['name'][$k]=='num')
+                               {
+                                       $params['sortable']     = true;
+                               }
+                                               
                                array_push ($data['datatable']['field'], 
$params);
                        }