[Phpgroupware-cvs] property/inc class.soequipment.inc.php, 1.28, 1.29 class.uiequipment.inc.php, 1.33, 1.34 class.boequipment.inc.php, 1.16, 1.17

[Sigurd Nes <address@hidden>]

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

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

Index: class.boequipment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boequipment.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** class.boequipment.inc.php   29 Sep 2003 17:53:52 -0000      1.16
--- class.boequipment.inc.php   30 Sep 2003 18:19:13 -0000      1.17
***************
*** 211,228 ****
                        $cols_return_lookup             = 
$this->so->cols_return_lookup;
  
- //_debug_array($this->uicols);
                        for ($i=0;$i<count($equipment);$i++)
                        {
                                
$location_data=$this->solocation->read_single($equipment[$i]['location_code']);
- //_debug_array($location_data);
                                for ($j=0;$j<count($cols_extra);$j++)
                                {
                                        $equipment[$i][$cols_extra[$j]] = 
$location_data[$cols_extra[$j]];
                                }
!                               for ($j=0;$j<count($cols_extra);$j++)
                                {
!                                       $equipment[$i][$cols_return_lookup[$j]] 
= $location_data[$cols_return_lookup[$j]];
                                }
- 
                        }
  
--- 211,229 ----
                        $cols_return_lookup             = 
$this->so->cols_return_lookup;
  
                        for ($i=0;$i<count($equipment);$i++)
                        {
                                
$location_data=$this->solocation->read_single($equipment[$i]['location_code']);
                                for ($j=0;$j<count($cols_extra);$j++)
                                {
                                        $equipment[$i][$cols_extra[$j]] = 
$location_data[$cols_extra[$j]];
                                }
! 
!                               if($cols_return_lookup)
                                {
!                                       for 
($k=0;$k<count($cols_return_lookup);$k++)
!                                       {
!                                               
$equipment[$i][$cols_return_lookup[$k]] = 
$location_data[$cols_return_lookup[$k]];
!                                       }
                                }
                        }
  

Index: class.uiequipment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiequipment.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** class.uiequipment.inc.php   29 Sep 2003 17:53:51 -0000      1.33
--- class.uiequipment.inc.php   30 Sep 2003 18:19:12 -0000      1.34
***************
*** 84,88 ****
  
                        $equipment_list = 
$this->bo->read(array('allrows'=>true));
- 
                        $uicols = $this->bo->uicols;
                        $count_uicols_name=count($uicols['name']);
--- 84,87 ----
***************
*** 337,341 ****
                                        'lang_add'                              
=> lang('add'),
                                        'lang_add_statustext'   => lang('add a 
equipment'),
!                                       'add_action'                    => 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiequipment.edit')
                                );
                        }
--- 336,340 ----
                                        'lang_add'                              
=> lang('add'),
                                        'lang_add_statustext'   => lang('add a 
equipment'),
!                                       'add_action'                    => 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiequipment.edit&cat_id='.
 $this->cat_id)
                                );
                        }
***************
*** 578,582 ****
                        (
                                'menuaction'    => 
$this->currentapp.'.uiequipment.edit',
!                               'id'                    => $id
                        );
  
--- 577,582 ----
                        (
                                'menuaction'    => 
$this->currentapp.'.uiequipment.edit',
!                               'id'                    => $id,
!                               'cat_id'                => $this->cat_id
                        );
  
***************
*** 639,643 ****
                                'lookup_type'                                   
=> $lookup_type,
                                'form_action'                                   
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
!                               'done_action'                                   
=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiequipment.index'),
                                'lang_year'                                     
        => lang('Year'),
                                'lang_category'                                 
=> lang('category'),
--- 639,643 ----
                                'lookup_type'                                   
=> $lookup_type,
                                'form_action'                                   
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
!                               'done_action'                                   
=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiequipment.index&cat_id='.
 $this->cat_id),
                                'lang_year'                                     
        => lang('Year'),
                                'lang_category'                                 
=> lang('category'),
***************
*** 661,665 ****
                                'select_name'                                   
=> 'values[cat_id]',
                                'value_cat_id'                                  
=> $values['cat_id'],
!                               'cat_list'                                      
        => 
$this->bocommon->select_category_equipment_list('select',$values['cat_id']),
                                'status_list'                                   
=> $this->bo->select_status_list('select',$values['status']),
                                'select_status_name'                    => 
'values[status]',
--- 661,665 ----
                                'select_name'                                   
=> 'values[cat_id]',
                                'value_cat_id'                                  
=> $values['cat_id'],
!                               'cat_list'                                      
        => 
$this->bocommon->select_category_equipment_list('select',$this->cat_id),
                                'status_list'                                   
=> $this->bo->select_status_list('select',$values['status']),
                                'select_status_name'                    => 
'values[status]',

Index: class.soequipment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soequipment.inc.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** class.soequipment.inc.php   29 Sep 2003 21:29:18 -0000      1.28
--- class.soequipment.inc.php   30 Sep 2003 18:19:12 -0000      1.29
***************
*** 308,313 ****
                                $j++;
                        }
- //_debug_array($equipment_list);
- 
                        return $equipment_list;
                }
--- 308,311 ----