[Fmsystem-commits] [6951] property: location filter

[Sigurd Nes]

Revision: 6951
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6951
Author:   sigurdne
Date:     2011-02-07 17:01:47 +0000 (Mon, 07 Feb 2011)
Log Message:
-----------
property: location filter

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

Modified: trunk/property/inc/class.bocommon.inc.php
===================================================================
--- trunk/property/inc/class.bocommon.inc.php   2011-02-07 10:12:19 UTC (rev 
6950)
+++ trunk/property/inc/class.bocommon.inc.php   2011-02-07 17:01:47 UTC (rev 
6951)
@@ -1175,17 +1175,17 @@
                {
                        //_debug_array($data);
 
-                       $cols                           = 
(isset($data['cols'])?$data['cols']:'');
-                       $entity_table           = 
(isset($data['entity_table'])?$data['entity_table']:'');
-                       $cols_return            = 
(isset($data['cols_return'])?$data['cols_return']:'');
-                       $uicols                         = 
(isset($data['uicols'])?$data['uicols']:'');
-                       $joinmethod             = 
(isset($data['joinmethod'])?$data['joinmethod']:'');
-                       $paranthesis            = 
(isset($data['paranthesis'])?$data['paranthesis']:'');
-                       $lookup                         = 
(isset($data['lookup'])?$data['lookup']:'');
-                       $location_level         = 
(isset($data['location_level'])?$data['location_level']:'');
-                       $no_address             = 
(isset($data['no_address'])?$data['no_address']:'');
-                       $uicol_address          = 
(isset($data['uicol_address'])?$data['uicol_address']:'');
-                       $force_location         = 
(isset($data['force_location'])?$data['force_location']:'');
+                       $cols                           = 
isset($data['cols'])?$data['cols']:'';
+                       $entity_table           = 
isset($data['entity_table'])?$data['entity_table']:'';
+                       $cols_return            = isset($data['cols_return']) 
&& $data['cols_return'] ? $data['cols_return']:array();
+                       $uicols                         = 
isset($data['uicols']) && $data['uicols'] ? $data['uicols']: array();
+                       $joinmethod             = 
isset($data['joinmethod'])?$data['joinmethod']:'';
+                       $paranthesis            = 
isset($data['paranthesis'])?$data['paranthesis']:'';
+                       $lookup                         = 
isset($data['lookup'])?$data['lookup']:'';
+                       $location_level         = 
isset($data['location_level'])?$data['location_level']:'';
+                       $no_address             = 
isset($data['no_address'])?$data['no_address']:'';
+                       $uicol_address          = 
isset($data['uicol_address'])?$data['uicol_address']:'';
+                       $force_location         = 
isset($data['force_location'])?$data['force_location']:'';
                        $cols_extra             = array();
                        $cols_return_lookup     = array();
 
@@ -1220,7 +1220,7 @@
                        }
                        $this->type_id  = $type_id;
 
-/*
+
                        for ($i=0; $i<$type_id; $i++)
                        {
                                $uicols['input_type'][]         = 'text';
@@ -1232,9 +1232,9 @@
                                $uicols['datatype'][]           = '';
                                $uicols['formatter'][]          = '';
                                $uicols['classname'][]          = '';
-                               $uicols['sortable'][]           = '';
+                               $uicols['sortable'][]           = $i === 0;
                        }
-*/
+
                        unset($soadmin_location);
 
                        for ($i=0; $i< $this->type_id; $i++)

Modified: trunk/property/inc/class.soentity.inc.php
===================================================================
--- trunk/property/inc/class.soentity.inc.php   2011-02-07 10:12:19 UTC (rev 
6950)
+++ trunk/property/inc/class.soentity.inc.php   2011-02-07 17:01:47 UTC (rev 
6951)
@@ -162,6 +162,9 @@
                                $uicols['align'][]                      = '';
                                $uicols['datatype'][]           = '';
                                $uicols['sortable'][]           = true;
+                               $uicols['exchange'][]           = false;
+                               $uicols['formatter'][]          = '';
+                               $uicols['classname'][]          = '';
 
                                $cols_return[]                          = 'num';
                                $uicols['input_type'][]         = 'text';
@@ -171,6 +174,9 @@
                                $uicols['align'][]                      = '';
                                $uicols['datatype'][]           = '';
                                $uicols['sortable'][]           = true;
+                               $uicols['exchange'][]           = false;
+                               $uicols['formatter'][]          = '';
+                               $uicols['classname'][]          = '';
 
                                $cols_return[]                          = 'id';
                                $uicols['input_type'][]         = 'hidden';
@@ -180,6 +186,9 @@
                                $uicols['align'][]                      = '';
                                $uicols['datatype'][]           = '';
                                $uicols['sortable'][]           = false;
+                               $uicols['exchange'][]           = false;
+                               $uicols['formatter'][]          = '';
+                               $uicols['classname'][]          = '';
 
                                if($lookup)
                                {
@@ -192,6 +201,9 @@
                                        $uicols['align'][]                      
= '';
                                        $uicols['datatype'][]           = '';
                                        $uicols['sortable'][]           = false;
+                                       $uicols['exchange'][]           = false;
+                                       $uicols['formatter'][]          = '';
+                                       $uicols['classname'][]          = '';
                                }
 
                                $cols .= ", {$entity_table}.user_id";
@@ -203,12 +215,15 @@
                                $uicols['align'][]                      = '';
                                $uicols['datatype'][]           = 'user';
                                $uicols['sortable'][]           = false;
+                               $uicols['exchange'][]           = false;
+                               $uicols['formatter'][]          = '';
+                               $uicols['classname'][]          = '';
 
                                $cols_return_extra[]= array
-                                       (
-                                               'name'          => 'user_id',
-                                               'datatype'      => 'user'
-                                       );
+                               (
+                                       'name'          => 'user_id',
+                                       'datatype'      => 'user'
+                               );
 
                                // Don't work with LDAP - where phpgw_accounts 
is empty
                                //                      $joinmethod = " 
$this->join phpgw_accounts ON ($entity_table.user_id = 
phpgw_accounts.account_id))";