[Phpgroupware-cvs] CVS: property/inc class.bolocation.inc.php,1.11,1.12 class.uiequipment.inc.php,1.24,1.25

[Sigurd Nes <address@hidden>]

Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv22252/inc

Modified Files:
        class.bolocation.inc.php class.uiequipment.inc.php 
Log Message:
no message

Index: class.bolocation.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bolocation.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** class.bolocation.inc.php    18 Jun 2003 11:21:17 -0000      1.11
--- class.bolocation.inc.php    18 Jun 2003 11:55:17 -0000      1.12
***************
*** 169,173 ****
                {
  
- //_debug_array($data);
                        switch($data['lookup_type'])
                        {
--- 169,172 ----
***************
*** 188,195 ****
                        $location_types = 
$this->soadmin_location->select_location_type();
                        $this->location_types   = $location_types;
!                       if(!isset($data['type_id']))
                        {
                                $data['type_id'] = count($location_types);
                        }
  //_debug_array($location_types);
                        $fm_location_cols = 
$this->soadmin_location->read_attrib(array('type_id'=>$data['type_id'],'lookup_type'=>$data['type_id']));
--- 187,196 ----
                        $location_types = 
$this->soadmin_location->select_location_type();
                        $this->location_types   = $location_types;
! 
!                       if($data['type_id']<0)
                        {
                                $data['type_id'] = count($location_types);
                        }
+ //_debug_array($data);
  //_debug_array($location_types);
                        $fm_location_cols = 
$this->soadmin_location->read_attrib(array('type_id'=>$data['type_id'],'lookup_type'=>$data['type_id']));

Index: class.uiequipment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiequipment.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** class.uiequipment.inc.php   18 Jun 2003 11:21:17 -0000      1.24
--- class.uiequipment.inc.php   18 Jun 2003 11:55:17 -0000      1.25
***************
*** 341,345 ****
                        
$location_data=$this->bolocation->initiate_ui_location(array(
                                                'values'                => 
$values['location_data'],
!                                               'type_id'               => 
False, // calculated from location_types
                                                'no_link'               => 
False, // disable lookup links for location type less than type_id
                        //                      'tenant'                => True,
--- 341,345 ----
                        
$location_data=$this->bolocation->initiate_ui_location(array(
                                                'values'                => 
$values['location_data'],
!                                               'type_id'               => -1, 
// calculated from location_types
                                                'no_link'               => 
False, // disable lookup links for location type less than type_id
                        //                      'tenant'                => True,
***************
*** 523,527 ****
                        
$location_data=$this->bolocation->initiate_ui_location(array(
                                                'values'                => 
$values['location_data'],
!                                               'type_id'               => 
False, // calculated from location_types
                                                'no_link'               => 
False, // disable lookup links for location type less than type_id
                        //                      'tenant'                => True,
--- 523,527 ----
                        
$location_data=$this->bolocation->initiate_ui_location(array(
                                                'values'                => 
$values['location_data'],
!                                               'type_id'               => -1, 
// calculated from location_types
                                                'no_link'               => 
False, // disable lookup links for location type less than type_id
                        //                      'tenant'                => True,