[Fmsystem-commits] [6929] property: fix broken sql related to sorting

[Sigurd Nes]

Revision: 6929
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6929
Author:   sigurdne
Date:     2011-02-04 12:53:49 +0000 (Fri, 04 Feb 2011)
Log Message:
-----------
property: fix broken sql related to sorting

Modified Paths:
--------------
    trunk/property/inc/class.bocommon.inc.php
    trunk/property/inc/class.soentity.inc.php
    trunk/property/inc/class.uientity.inc.php

Modified: trunk/property/inc/class.bocommon.inc.php
===================================================================
--- trunk/property/inc/class.bocommon.inc.php   2011-02-03 19:30:34 UTC (rev 
6928)
+++ trunk/property/inc/class.bocommon.inc.php   2011-02-04 12:53:49 UTC (rev 
6929)
@@ -1258,7 +1258,7 @@
                                $uicols['datatype'][]           = '';
                                $uicols['formatter'][]          = '';
                                $uicols['classname'][]          = '';
-                               $uicols['sortable'][]           = '';
+                               $uicols['sortable'][]           = $i == 1;
                        }
 
                        if(!$no_address)

Modified: trunk/property/inc/class.soentity.inc.php
===================================================================
--- trunk/property/inc/class.soentity.inc.php   2011-02-03 19:30:34 UTC (rev 
6928)
+++ trunk/property/inc/class.soentity.inc.php   2011-02-04 12:53:49 UTC (rev 
6929)
@@ -161,6 +161,7 @@
                                $uicols['statustext'][]         = 'dummy';
                                $uicols['align'][]                      = '';
                                $uicols['datatype'][]           = '';
+                               $uicols['sortable'][]           = true;
 
                                $cols_return[]                          = 'num';
                                $uicols['input_type'][]         = 'text';
@@ -169,6 +170,7 @@
                                $uicols['statustext'][]         = lang('ID');
                                $uicols['align'][]                      = '';
                                $uicols['datatype'][]           = '';
+                               $uicols['sortable'][]           = true;
 
                                $cols_return[]                          = 'id';
                                $uicols['input_type'][]         = 'hidden';
@@ -177,6 +179,7 @@
                                $uicols['statustext'][]         = false;
                                $uicols['align'][]                      = '';
                                $uicols['datatype'][]           = '';
+                               $uicols['sortable'][]           = false;
 
                                if($lookup)
                                {
@@ -188,6 +191,7 @@
                                        $uicols['statustext'][]         = 
'dummy';
                                        $uicols['align'][]                      
= '';
                                        $uicols['datatype'][]           = '';
+                                       $uicols['sortable'][]           = false;
                                }
 
                                $cols .= ", {$entity_table}.user_id";
@@ -198,6 +202,7 @@
                                $uicols['statustext'][]         = lang('User');
                                $uicols['align'][]                      = '';
                                $uicols['datatype'][]           = 'user';
+                               $uicols['sortable'][]           = false;
 
                                $cols_return_extra[]= array
                                        (
@@ -254,6 +259,7 @@
                                        $uicols['descr'][]                      
= $this->db->f('input_text');
                                        $uicols['statustext'][]         = 
$this->db->f('statustext');
                                        $uicols['datatype'][$i]         = 
$this->db->f('datatype');
+                                       $uicols['sortable'][$i]         = true;
                                        $uicols['cols_return_extra'][$i] = array
                                                (
                                                        'name'  => 
$this->db->f('column_name'),
@@ -276,6 +282,7 @@
                                $uicols['descr'][]                      = 
lang('entry date');
                                $uicols['statustext'][]         = lang('entry 
date' );
                                $uicols['datatype'][]           = 'timestamp';
+                               $uicols['sortable'][]           = true;
                                $uicols['cols_return_extra'][$i] = array
                                        (
                                                'name'          => 'entry_date',
@@ -303,6 +310,9 @@
                                        case 'user_id':
                //                              $ordermethod = " ORDER BY 
phpgw_accounts.account_lastname {$sort}";  // Don't work with LDAP. 
                                                break;
+                                       case 'loc1_name':
+                                               $ordermethod = " ORDER BY 
fm_location1.loc1_name {$sort}";  // Don't work with LDAP. 
+                                               break;
                                        default:
                                                $ordermethod = " ORDER BY 
$entity_table.$order $sort";  
                                }
@@ -351,7 +361,7 @@
                                $where= 'AND';
                        }
 
-                       if ($district_id > 0)
+                       if ($district_id > 0 && $category['location_level'])
                        {
                                $filtermethod .= " $where  
fm_part_of_town.district_id='$district_id' ";
                                $where = 'AND';

Modified: trunk/property/inc/class.uientity.inc.php
===================================================================
--- trunk/property/inc/class.uientity.inc.php   2011-02-03 19:30:34 UTC (rev 
6928)
+++ trunk/property/inc/class.uientity.inc.php   2011-02-04 12:53:49 UTC (rev 
6929)
@@ -891,14 +891,14 @@
                                        
$datatable['headers']['header'][$i]['text']                     = 
$uicols['descr'][$i];
                                        
$datatable['headers']['header'][$i]['visible']                  = true;
                                        
$datatable['headers']['header'][$i]['format']                   = 
$this->bocommon->translate_datatype_format($uicols['datatype'][$i]);
-                                       
$datatable['headers']['header'][$i]['sortable']                 = false;
+                                       
$datatable['headers']['header'][$i]['sortable']                 = 
$uicols['sortable'][$i];;
                                        
//$datatable['headers']['header'][$i]['formatter']              = 
$uicols['formatter'][$i];
                                        //according to stable bruch this 
columns is not SORTABLE'
                                        $denied = array('merknad');//$denied = 
array('merknad','account_lid');
                                        //if not include
-                                       if(!in_array ($uicols['name'][$i], 
$denied))
+                                       if(in_array ($uicols['name'][$i], 
$denied))
                                        {
-                                               
$datatable['headers']['header'][$i]['sortable']         = true;
+                                               
$datatable['headers']['header'][$i]['sortable']         = false;
                                                
$datatable['headers']['header'][$i]['sort_field']       = $uicols['name'][$i];
                                        }
                                        else 
if(isset($uicols['cols_return_extra'][$i]) && 
($uicols['cols_return_extra'][$i]!='T' || 
$uicols['cols_return_extra'][$i]!='CH'))