[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php,1.64,1.65 cl
From: |
Sigurd Nes <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php,1.64,1.65 class.sostandard_entity.inc.php,1.11,1.12 class.uilocation.inc.php,1.18,1.19 hook_admin.inc.php,1.35,1.36 hook_settings.inc.php,1.7,1.8 |
Date: |
Sat, 28 Jun 2003 13:58:00 -0400 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv25520/inc
Modified Files:
class.bocommon.inc.php class.sostandard_entity.inc.php
class.uilocation.inc.php hook_admin.inc.php
hook_settings.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.64
retrieving revision 1.65
diff -C2 -r1.64 -r1.65
*** class.bocommon.inc.php 28 Jun 2003 16:17:33 -0000 1.64
--- class.bocommon.inc.php 28 Jun 2003 17:57:57 -0000 1.65
***************
*** 445,449 ****
}
! if ($sub == property)
{
$location =
$this->soadmin_location->select_location_type();
--- 445,449 ----
}
! if ($sub == location)
{
$location =
$this->soadmin_location->select_location_type();
Index: class.sostandard_entity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sostandard_entity.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** class.sostandard_entity.inc.php 21 Jun 2003 19:27:35 -0000 1.11
--- class.sostandard_entity.inc.php 28 Jun 2003 17:57:57 -0000 1.12
***************
*** 91,97 ****
$table='fm_equipment_type';
break;
- case 'location':
- $table='fm_location_type';
- break;
case 'report':
$table='fm_report_type';
--- 91,94 ----
***************
*** 109,115 ****
case 'equipment':
$table='fm_equipment_type_attrib';
- break;
- case 'location':
- $table='fm_location_type_attrib';
break;
case 'report':
--- 106,109 ----
Index: class.uilocation.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uilocation.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** class.uilocation.inc.php 28 Jun 2003 16:11:47 -0000 1.18
--- class.uilocation.inc.php 28 Jun 2003 17:57:57 -0000 1.19
***************
*** 52,56 ****
$this->district_id =
$this->bo->district_id;
!
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'property');
}
--- 52,56 ----
$this->district_id =
$this->bo->district_id;
!
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'location');
}
***************
*** 84,87 ****
--- 84,91 ----
$lookup_tenant =
get_var('lookup_tenant',array('POST','GET'));
+ if(!$type_id)
+ {
+ $type_id=1;
+ }
if($lookup)
{
Index: hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/hook_admin.inc.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** hook_admin.inc.php 28 Jun 2003 16:11:47 -0000 1.35
--- hook_admin.inc.php 28 Jun 2003 17:57:57 -0000 1.36
***************
*** 17,22 ****
'Equipment type'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_entity.index&type=equipment'),
'Report type'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_entity.index&type=report'),
! 'Location type'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_entity.index&type=location'),
! 'Location type_2'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uiadmin_location.index'),
'Update the not active category for
locations'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uilocation.update_cat'),
// 'Request Categories'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=request'),
--- 17,21 ----
'Equipment type'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_entity.index&type=equipment'),
'Report type'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_entity.index&type=report'),
! 'Location type'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uiadmin_location.index'),
'Update the not active category for
locations'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uilocation.update_cat'),
// 'Request Categories'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=request'),
Index: hook_settings.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/hook_settings.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** hook_settings.inc.php 2 Apr 2003 11:13:46 -0000 1.7
--- hook_settings.inc.php 28 Jun 2003 17:57:57 -0000 1.8
***************
*** 62,66 ****
$default_start_page = array(
! 'property' => lang('Property'),
'equipment' => lang('Equipment'),
'project' => lang('Project'),
--- 62,66 ----
$default_start_page = array(
! 'location' => lang('Location'),
'equipment' => lang('Equipment'),
'project' => lang('Project'),
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php,1.64,1.65 class.sostandard_entity.inc.php,1.11,1.12 class.uilocation.inc.php,1.18,1.19 hook_admin.inc.php,1.35,1.36 hook_settings.inc.php,1.7,1.8,
Sigurd Nes <address@hidden> <=