[Fmsystem-commits] [11533] Add related data from linked locations as columns

[Sigurd Nes]

Revision: 11533
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11533
Author:   sigurdne
Date:     2013-12-15 15:37:44 +0000 (Sun, 15 Dec 2013)
Log Message:
-----------
Add related data from linked locations as columns

Modified Paths:
--------------
    trunk/property/inc/class.boentity.inc.php

Modified: trunk/property/inc/class.boentity.inc.php
===================================================================
--- trunk/property/inc/class.boentity.inc.php   2013-12-15 15:17:13 UTC (rev 
11532)
+++ trunk/property/inc/class.boentity.inc.php   2013-12-15 15:37:44 UTC (rev 
11533)
@@ -238,8 +238,10 @@
                        $columns = array();
 
                        // defined i property_bocommon::generate_sql()
-                       $this->location_relation_data =         
phpgwapi_cache::system_get('property', 'location_relation_data');
+                       $location_relation_data = 
phpgwapi_cache::system_get('property', 'location_relation_data');
                        
+                       $this->location_relation_data = $location_relation_data 
&& is_array($location_relation_data) ? $location_relation_data : array();
+                       
                        if( $this->location_relation_data && 
is_array($this->location_relation_data))
                        {
                                foreach ($this->location_relation_data as 
$entry)
@@ -408,7 +410,7 @@
                        $cols_extra             = $this->so->cols_extra;
                        $cols_return_lookup             = 
$this->so->cols_return_lookup;
 
-/*
+
                        foreach ($custom_cols as $col_id => $col_info)
                        {
                                if( in_array( $col_id, $user_columns ) )
@@ -426,9 +428,10 @@
                                        $cols_extra[]                           
        = $col_id;
                                }
                        }
-*/
+
 //_debug_array($cols_extra);
 //_debug_array($this->uicols);die();
+/*
                        $location_relation_data =       
$this->location_relation_data;
                        
                        if ($location_relation_data && 
is_array($location_relation_data))
@@ -452,8 +455,8 @@
                        }
                        
                        unset($entry);
+*/
 
-
                        //_debug_array($entity);
 //                     _debug_array($cols_extra);
                        //_debug_array($cols_return_lookup);