[Phpgroupware-cvs] property/inc class.solocation.inc.php

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    property
Changes by:     Sigurd Nes <sigurdne>   06/11/23 20:47:42

Modified files:
        inc            : class.solocation.inc.php 

Log message:
        

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.solocation.inc.php?cvsroot=phpgroupware&r1=1.41&r2=1.42

Patches:
Index: class.solocation.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.solocation.inc.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- class.solocation.inc.php    30 Oct 2006 09:49:13 -0000      1.41
+++ class.solocation.inc.php    23 Nov 2006 20:47:42 -0000      1.42
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage location
-       * @version $Id: class.solocation.inc.php,v 1.41 2006/10/30 09:49:13 
sigurdne Exp $
+       * @version $Id: class.solocation.inc.php,v 1.42 2006/11/23 20:47:42 
sigurdne Exp $
        */
 
        /**
@@ -214,16 +214,37 @@
                                        $cols_return[] = 'loc' . 
$location_types[$i]['id'];
                                }
 
+                               // make this configurable
+                               
+                               $location_naming = array
+                                                               (
+                                                                       1 => 
true,
+                                                                       2 => 
true
+                                                               );
+                               
+                               for ($i=1; $i<($type_id+1); $i++)
+                               {
+                                       if(isset($location_naming[$i]) && 
$location_naming[$i])
+                                       {
+                                               $cols.= ',fm_location' . $i . 
'.loc' . ($i) . '_name';
+                                               $cols_return[]                  
        = 'loc' . ($i) . '_name';
+                                               $uicols['input_type'][]         
= 'text';
+                                               $uicols['name'][]               
        = 'loc' . ($i) . '_name';
+                                               $uicols['descr'][]              
        = $location_types[($i-1)]['name'] . ' ' . lang('name');
+                                               $uicols['statustext'][]         
= $location_types[($i-1)]['name'] . ' ' . lang('name');
+                                               $uicols['exchange'][]           
= True;
+                                       }
+                               }
 
        //                      $street_level = 
$this->soadmin_location->read_config_single('street_id');
        //                      if ($street_level > $type_id)
-                               {
+/*                             {
                                        $cols.= ',fm_location1.loc1_name as 
loc1_name';
                                        $cols_return[]                          
= 'loc1_name';
                                        $uicols['input_type'][]         = 
'text';
                                        $uicols['name'][]                       
= 'loc1_name';
-                                       $uicols['descr'][]                      
= lang('Property Name');
-                                       $uicols['statustext'][]         = 
lang('Property Name');
+                                       $uicols['descr'][]                      
= $location_types[0]['name'] . ' ' . lang('name');
+                                       $uicols['statustext'][]         = 
$location_types[0]['name'] . ' ' . lang('name');
                                        $uicols['exchange'][]           = True;
 
                                        if($type_id>1)
@@ -237,7 +258,7 @@
                                                $uicols['exchange'][]           
= True;
                                        }
                                }
-
+*/
 /*                             for ($i=2;$i<($type_id+1);$i++)
                                {
                                        $cols.= ',fm_location' . $i . '.loc' . 
$i . '_name';