[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.soadmin_location.inc.php, 1.
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.soadmin_location.inc.php, 1.15, 1.16 class.socategory.inc.php, 1.9, 1.10 class.solocation.inc.php, 1.22, 1.23 class.solookup.inc.php, 1.23, 1.24 class.uilookup.inc.php, 1.26, 1.27 class.uiowner.inc.php, 1.9, 1.10 hook_admin.inc.php, 1.40, 1.41 |
|
Date: |
Wed, 16 Jul 2003 06:38:33 -0400 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv26650/inc
Modified Files:
class.soadmin_location.inc.php class.socategory.inc.php
class.solocation.inc.php class.solookup.inc.php
class.uilookup.inc.php class.uiowner.inc.php
hook_admin.inc.php
Log Message:
no message
Index: class.soadmin_location.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soadmin_location.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** class.soadmin_location.inc.php 4 Jul 2003 09:56:25 -0000 1.15
--- class.soadmin_location.inc.php 16 Jul 2003 10:38:31 -0000 1.16
***************
*** 131,134 ****
--- 131,135 ----
'query_value' =>
$this->db->f('query_value'),
'reference_table' =>
$this->db->f('reference_table'),
+ 'reference_id' =>
$this->db->f('reference_id'),
'location_name' =>
$this->db->f('name'),
'location_type' =>
$this->db->f('location_type')
Index: class.socategory.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.socategory.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** class.socategory.inc.php 16 Jul 2003 08:12:24 -0000 1.9
--- class.socategory.inc.php 16 Jul 2003 10:38:31 -0000 1.10
***************
*** 133,136 ****
--- 133,139 ----
$table='fm_district';
break;
+ case 'street':
+ $table='fm_streetaddress';
+ break;
}
Index: class.solocation.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.solocation.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** class.solocation.inc.php 11 Jul 2003 11:03:53 -0000 1.22
--- class.solocation.inc.php 16 Jul 2003 10:38:31 -0000 1.23
***************
*** 231,235 ****
if (($config[$i]['location_type'] <= $type_id)
&& ($config[$i]['f_key'] ==1))
{
! $joinmethod .= " $this->left_join " .
$config[$i]['reference_table'] . " ON ( fm_location" .
$config[$i]['location_type'] . "." . $config[$i]['column_name'] . "=" .
$config[$i]['reference_table'] . ".".$config[$i]['column_name']."))";
$paranthesis .='(';
--- 231,235 ----
if (($config[$i]['location_type'] <= $type_id)
&& ($config[$i]['f_key'] ==1))
{
! $joinmethod .= " $this->left_join " .
$config[$i]['reference_table'] . " ON ( fm_location" .
$config[$i]['location_type'] . "." . $config[$i]['column_name'] . "=" .
$config[$i]['reference_table'] . ".".$config[$i]['reference_id']."))";
$paranthesis .='(';
***************
*** 242,246 ****
{
$sub_query .= "or street_name
LIKE '%$query%'";
! $cols.=
',fm_streetaddress.street_name';
$cols_return[]
= 'street_name';
$uicols['input_type'][]
= 'text';
--- 242,246 ----
{
$sub_query .= "or street_name
LIKE '%$query%'";
! $cols.=
',fm_streetaddress.descr as street_name';
$cols_return[]
= 'street_name';
$uicols['input_type'][]
= 'text';
***************
*** 291,295 ****
else
{
! $ordermethod = ' order by fm_location' .
($type_id) .'.location_code DESC';
}
--- 291,295 ----
else
{
! $ordermethod = ' order by fm_location' .
($type_id) .'.location_code ASC';
}
***************
*** 434,438 ****
if (($config[$i]['location_type'] <= $type_id)
&& ($config[$i]['f_key'] ==1))
{
! $joinmethod .= " $this->join " .
$config[$i]['reference_table'] . " ON ( fm_location" .
$config[$i]['location_type'] . "." . $config[$i]['column_name'] . "=" .
$config[$i]['reference_table'] . ".".$config[$i]['column_name']."))";
$paranthesis .='(';
--- 434,438 ----
if (($config[$i]['location_type'] <= $type_id)
&& ($config[$i]['f_key'] ==1))
{
! $joinmethod .= " $this->left_join " .
$config[$i]['reference_table'] . " ON ( fm_location" .
$config[$i]['location_type'] . "." . $config[$i]['column_name'] . "=" .
$config[$i]['reference_table'] . ".".$config[$i]['reference_id']."))";
$paranthesis .='(';
***************
*** 444,448 ****
if($config[$i]['column_name']=='street_id'):
{
! $cols.=
',fm_streetaddress.street_name';
$cols_return[]
= 'street_name';
$uicols['input_type'][]
= 'text';
--- 444,448 ----
if($config[$i]['column_name']=='street_id'):
{
! $cols.= ',fm_streetaddress.id
as street_name';
$cols_return[]
= 'street_name';
$uicols['input_type'][]
= 'text';
Index: class.solookup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.solookup.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** class.solookup.inc.php 28 Jun 2003 16:11:47 -0000 1.23
--- class.solookup.inc.php 16 Jul 2003 10:38:31 -0000 1.24
***************
*** 194,198 ****
else
{
! $ordermethod = ' order by fm_streetaddress
.street_name DESC';
}
--- 194,198 ----
else
{
! $ordermethod = ' order by
fm_streetaddress.descr DESC';
}
***************
*** 202,206 ****
$query = ereg_replace('"','',$query);
! $querymethod = " where ( street_name LIKE
'%$query%')";
}
--- 202,206 ----
$query = ereg_replace('"','',$query);
! $querymethod = " where ( descr LIKE
'%$query%')";
}
***************
*** 215,220 ****
$street[] = array
(
! 'id' =>
$this->db->f('street_id'),
! 'street_name' =>
$this->db->f('street_name')
);
}
--- 215,220 ----
$street[] = array
(
! 'id' =>
$this->db->f('id'),
! 'street_name' => $this->db->f('descr')
);
}
Index: class.uilookup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uilookup.inc.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** class.uilookup.inc.php 28 Jun 2003 16:11:47 -0000 1.26
--- class.uilookup.inc.php 16 Jul 2003 10:38:31 -0000 1.27
***************
*** 315,319 ****
(
'sort' => $this->sort,
!
'var' => 'street_id',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uilookup.street',
--- 315,319 ----
(
'sort' => $this->sort,
!
'var' => 'id',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uilookup.street',
Index: class.uiowner.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiowner.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** class.uiowner.inc.php 30 Jun 2003 10:49:14 -0000 1.9
--- class.uiowner.inc.php 16 Jul 2003 10:38:31 -0000 1.10
***************
*** 246,254 ****
$values['org_name'] =
get_var('vendor_name',array('POST'));
! if($GLOBALS['phpgw']->is_repost())
{
$receipt['error'][]=array('msg'=>lang('Repost
!'));
}
!
$GLOBALS['phpgw']->xslttpl->add_file(array('owner'));
--- 246,254 ----
$values['org_name'] =
get_var('vendor_name',array('POST'));
! /* if($GLOBALS['phpgw']->is_repost())
{
$receipt['error'][]=array('msg'=>lang('Repost
!'));
}
! */
$GLOBALS['phpgw']->xslttpl->add_file(array('owner'));
Index: hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/hook_admin.inc.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -r1.40 -r1.41
*** hook_admin.inc.php 16 Jul 2003 08:12:24 -0000 1.40
--- hook_admin.inc.php 16 Jul 2003 10:38:31 -0000 1.41
***************
*** 17,20 ****
--- 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'),
+ 'Street'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=street'),
'District'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=district'),
'Part of town'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uip_of_town.index'),
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.soadmin_location.inc.php, 1.15, 1.16 class.socategory.inc.php, 1.9, 1.10 class.solocation.inc.php, 1.22, 1.23 class.solookup.inc.php, 1.23, 1.24 class.uilookup.inc.php, 1.26, 1.27 class.uiowner.inc.php, 1.9, 1.10 hook_admin.inc.php, 1.40, 1.41,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/setup default_records.inc.php, 1.30, 1.31 tables_current.inc.php, 1.114, 1.115
- Next by Date:
[Phpgroupware-cvs] CVS: phpgroupware login.php,1.76.2.5,1.76.2.6
- Previous by thread:
[Phpgroupware-cvs] CVS: property/setup default_records.inc.php, 1.30, 1.31 tables_current.inc.php, 1.114, 1.115
- Next by thread:
[Phpgroupware-cvs] CVS: phpgroupware login.php,1.76.2.5,1.76.2.6
- Index(es):