[Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php,1.25,1.26 class.sostandard_2.inc.php,1.7,1.8 hook_admin.inc.php,1.21,1.22

[Sigurd Nes <address@hidden>]

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

Modified Files:
        class.bocommon.inc.php class.sostandard_2.inc.php 
        hook_admin.inc.php 
Log Message:
no message

Index: class.bocommon.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bocommon.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** class.bocommon.inc.php      10 Mar 2003 13:23:25 -0000      1.25
--- class.bocommon.inc.php      12 Mar 2003 21:37:32 -0000      1.26
***************
*** 154,161 ****
                        {
                                case 'select':
!                                       
$GLOBALS['phpgw']->xslttpl->add_file(array('user_id_select',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
 . SEP . 'app_header'));
                                        break;
                                case 'filter':
!                                       
$GLOBALS['phpgw']->xslttpl->add_file(array('user_id_filter',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
 . SEP . 'app_header'));
                                        break;
                        }
--- 154,161 ----
                        {
                                case 'select':
!                                       
$GLOBALS['phpgw']->xslttpl->add_file(array('user_id_select'));
                                        break;
                                case 'filter':
!                                       
$GLOBALS['phpgw']->xslttpl->add_file(array('user_id_filter'));
                                        break;
                        }
***************
*** 459,463 ****
                                'link_helpdesk'         =>      
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uitts.index'),
                                'lang_helpdesk'         =>      
lang('Helpdesk'),
!                               'link_workorder'        =>      
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiworkorder.index'),
                                'lang_workorder'        =>      
lang('Workorder'),
                                'link_invoice'          =>      
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiinvoice.index'),
--- 459,463 ----
                                'link_helpdesk'         =>      
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uitts.index'),
                                'lang_helpdesk'         =>      
lang('Helpdesk'),
!                               'link_workorder'        =>      
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiworkorder.project_list'),
                                'lang_workorder'        =>      
lang('Workorder'),
                                'link_invoice'          =>      
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiinvoice.index'),
***************
*** 594,598 ****
                                
$menu['sub_workorder_archive']=$GLOBALS['phpgw']->link('/property/list_workorder.php','sub=workorder&status=Avsluttet');
                                
$menu['sub_workorder_template']=$GLOBALS['phpgw']->link('/property/list_wo_template.php','sub=workorder');
!                               
$menu['sub_workorder_project']=$GLOBALS['phpgw']->link('/property/list_project.php','sub=workorder');
                                
$menu['sublang_workorder_project']=lang('Project');
                                
$menu['sublang_workorder_list']=lang('Workorder');
--- 594,598 ----
                                
$menu['sub_workorder_archive']=$GLOBALS['phpgw']->link('/property/list_workorder.php','sub=workorder&status=Avsluttet');
                                
$menu['sub_workorder_template']=$GLOBALS['phpgw']->link('/property/list_wo_template.php','sub=workorder');
!                               
$menu['sub_workorder_project']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiworkorder.project_list');
                                
$menu['sublang_workorder_project']=lang('Project');
                                
$menu['sublang_workorder_list']=lang('Workorder');

Index: class.sostandard_2.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sostandard_2.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** class.sostandard_2.inc.php  5 Mar 2003 14:31:49 -0000       1.7
--- class.sostandard_2.inc.php  12 Mar 2003 21:37:32 -0000      1.8
***************
*** 128,131 ****
--- 128,134 ----
                                        $table='fm_building_part';
                                        break;
+                               case 'wo':
+                                       $table='fm_wo_workorder_category';
+                                       break;
                                case 'property':
                                        $table='fm_property_category';

Index: hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/hook_admin.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** hook_admin.inc.php  8 Mar 2003 16:51:15 -0000       1.21
--- hook_admin.inc.php  12 Mar 2003 21:37:32 -0000      1.22
***************
*** 16,23 ****
                        (
        //                      'Global Categories' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname='
 . $appname),
!                               'Workorder Categories' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname=p_workorder'),
!                               'Property Categories' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname=p_property'),
!                               'Building Categories' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname=p_building'),
!       //                      'Equipment Categories' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname=p_equipment'),
                                'Ticket Categories' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname=p_ticket'),
                                'Documentation Categories' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname=p_documentation'),
--- 16,20 ----
                        (
        //                      'Global Categories' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname='
 . $appname),
!                               'Workorder Categories' => 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=wo'),
                                'Ticket Categories' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname=p_ticket'),
                                'Documentation Categories' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname=p_documentation'),
***************
*** 42,46 ****
                                'Request status'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=request_status'),
                                'Request type'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=request_type'),
-               //              'Request type attributes'=> 
$GLOBALS['phpgw']->link('/property/list_request_type_attribute.php'),
                                'Key location'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_3.index&type=key_location'),
                                'Branch'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_3.index&type=branch'),
--- 39,42 ----