[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.bolocation.inc.php,1.8,1.9 cl
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.bolocation.inc.php,1.8,1.9 class.soadmin_location.inc.php,1.8,1.9 class.solocation.inc.php,1.6,1.7 class.uilocation.inc.php,1.10,1.11 |
|
Date: |
Mon, 16 Jun 2003 04:53:24 -0400 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv4576/inc
Modified Files:
class.bolocation.inc.php class.soadmin_location.inc.php
class.solocation.inc.php class.uilocation.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.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.bolocation.inc.php 15 Jun 2003 19:41:26 -0000 1.8
--- class.bolocation.inc.php 16 Jun 2003 08:53:22 -0000 1.9
***************
*** 243,266 ****
if($config[$j]['location_type'] <=
$data['type_id'] && $config[$j]['lookup_form'] )
{
!
if($config[$j]['column_name']!='tenant_id')
{
$location['location'][$i]['input_name'] =
$config[$j]['column_name'];
- $input_name[]
=
$location['location'][$i]['input_name'];
- $insert_record[]
=
$location['location'][$i]['input_name'];
-
$location['location'][$i]['size'] = 5;
-
$location['location'][$i]['value'] =
$data['location']['value'][$config[$j]['column_name']];
-
$location['location'][$i]['lookup_function_call'] = 'lookup_loc' .
$fm_location_cols[$j]['location_type'] . '()';
$location['location'][$i]['lookup_link'] = True;
!
$location['location'][$i]['name'] =
$config[$j]['descr'];
!
$location['location'][$i]['value'] =
$data['values'][$config[$j]['column_name']];
!
$location['location'][$i]['statustext'] = lang('Klick
this link to select') . ' '
.$location_types[($fm_location_cols[$j]['location_type']-1)]['name'];
!
$location['location'][$i]['input_type'] = 'text';
! }
!
!
if($config[$j]['column_name']=='street_id')
! {
$location['location'][$i]['name'] =
lang('address');
$location['location'][$i]['input_type'] = 'hidden';
! $insert_record[]
= 'street_id';
$location['location'][$i]['extra'][0]['input_type']
= 'text';
--- 243,254 ----
if($config[$j]['location_type'] <=
$data['type_id'] && $config[$j]['lookup_form'] )
{
!
if($config[$j]['column_name']=='street_id'):
{
$location['location'][$i]['input_name'] =
$config[$j]['column_name'];
$location['location'][$i]['lookup_link'] = True;
!
$location['location'][$i]['lookup_function_call'] = 'lookup_loc' .
$fm_location_cols[$j]['location_type'] . '()';
$location['location'][$i]['name'] =
lang('address');
$location['location'][$i]['input_type'] = 'hidden';
!
$location['location'][$i]['value'] =
$data['values'][$config[$j]['column_name']];
$location['location'][$i]['extra'][0]['input_type']
= 'text';
***************
*** 280,285 ****
$location['location'][$i]['extra'][1]['value']
= $data['values']['street_number'];
}
!
!
if($config[$j]['column_name']=='tenant_id' && $data['tenant'])
{
$m++;
--- 268,272 ----
$location['location'][$i]['extra'][1]['value']
= $data['values']['street_number'];
}
!
elseif($config[$j]['column_name']=='tenant_id' && $data['tenant']):
{
$m++;
***************
*** 290,296 ****
$location['location'][$i]['name']
= lang('Tenant');
$location['location'][$i]['input_type']
= 'hidden';
$location['location'][$i]['lookup_function_call']
= $lookup_functions[$m]['name'];
$location['location'][$i]['statustext']
= lang('tenant');
! $insert_record[]
= 'tenant_id';
$location['location'][$i]['extra'][0]['input_type']
= 'text';
--- 277,284 ----
$location['location'][$i]['name']
= lang('Tenant');
$location['location'][$i]['input_type']
= 'hidden';
+
$location['location'][$i]['value'] =
$data['values'][$config[$j]['column_name']];
$location['location'][$i]['lookup_function_call']
= $lookup_functions[$m]['name'];
$location['location'][$i]['statustext']
= lang('tenant');
! // $insert_record[]
= 'tenant_id';
$location['location'][$i]['extra'][0]['input_type']
= 'text';
***************
*** 318,321 ****
--- 306,324 ----
$location['location'][$i]['extra'][2]['statustext']
= lang('contact phone');
}
+
elseif($config[$j]['column_name']!='tenant_id' &&
$config[$j]['column_name']!='street_id'):
+ {
+
$location['location'][$i]['input_name'] =
$config[$j]['column_name'];
+ $input_name[]
=
$location['location'][$i]['input_name'];
+ // $insert_record[]
=
$location['location'][$i]['input_name'];
+
$location['location'][$i]['size'] = 5;
+
$location['location'][$i]['value'] =
$data['location']['value'][$config[$j]['column_name']];
+
$location['location'][$i]['lookup_function_call'] = 'lookup_loc' .
$fm_location_cols[$j]['location_type'] . '()';
+
$location['location'][$i]['lookup_link'] = True;
+
$location['location'][$i]['name'] =
$config[$j]['descr'];
+
$location['location'][$i]['value'] =
$data['values'][$config[$j]['column_name']];
+
$location['location'][$i]['statustext'] = lang('Klick
this link to select') . ' '
.$location_types[($fm_location_cols[$j]['location_type']-1)]['name'];
+
$location['location'][$i]['input_type'] = 'text';
+ }
+ endif;
$i++;
}
***************
*** 349,352 ****
--- 352,357 ----
}
+
+ //_debug_array($insert_record);
$GLOBALS['phpgw']->session->appsession('lookup_fields',$this->currentapp,$input_name);
Index: class.soadmin_location.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soadmin_location.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.soadmin_location.inc.php 13 Jun 2003 11:05:29 -0000 1.8
--- class.soadmin_location.inc.php 16 Jun 2003 08:53:22 -0000 1.9
***************
*** 347,350 ****
--- 347,351 ----
$order =
(isset($data['order'])?$data['order']:'');
$type_id =
(isset($data['type_id'])?$data['type_id']:0);
+ $lookup_type =
(isset($data['lookup_type'])?$data['lookup_type']:'');
}
***************
*** 362,365 ****
--- 363,372 ----
$type_table = 'fm_location_type';
+ if ($lookup_type)
+ {
+ $filtermethod = " OR (type_id < $lookup_type
AND lookup_form=1) ";
+
+ }
+
if($query)
{
***************
*** 370,374 ****
}
! $sql = "SELECT
$table.id,$table.list,$table.location_form,lookup_form,$table.column_name,$table.size
,statustext,$table.input_text, $table.datatype ,$type_table.name as type FROM
$type_table $this->join $table on $table.type_id = $type_table.id where
$table.type_id= '$type_id' $querymethod";
$this->db2->query($sql,__LINE__,__FILE__);
--- 377,383 ----
}
! $sql = "SELECT
$table.id,$table.type_id,$table.list,$table.location_form,lookup_form,$table.column_name,$table.size
,statustext,$table.input_text,"
! . " $table.datatype ,$type_table.name as type
FROM $type_table $this->join $table on $table.type_id = $type_table.id "
! . " WHERE $table.type_id= '$type_id'
$filtermethod $querymethod";
$this->db2->query($sql,__LINE__,__FILE__);
***************
*** 381,385 ****
(
'id' =>
$this->db->f('id'),
! 'location_type' => $type_id,
'list' =>
$this->db->f('list'),
'lookup_form' =>
$this->db->f('lookup_form'),
--- 390,394 ----
(
'id' =>
$this->db->f('id'),
! 'location_type' =>
$this->db->f('type_id'),
'list' =>
$this->db->f('list'),
'lookup_form' =>
$this->db->f('lookup_form'),
Index: class.solocation.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.solocation.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.solocation.inc.php 15 Jun 2003 19:41:26 -0000 1.6
--- class.solocation.inc.php 16 Jun 2003 08:53:22 -0000 1.7
***************
*** 283,287 ****
else
{
! $filtermethod .= " WHERE fm_location" .
($type_id). ".category !=99 ";
}
--- 283,287 ----
else
{
! $filtermethod .= " WHERE (fm_location" .
($type_id). ".category !=99 OR fm_location" . ($type_id). ".category IS NULL)";
}
***************
*** 327,332 ****
$joinmethod .= " fm_location" . ($type_id);
- // $paranthesis .='(';
-
$location_types =
$this->soadmin_location->select_location_type();
--- 327,330 ----
***************
*** 343,347 ****
}
! $fm_location_cols =
$this->soadmin_location->read_attrib(array('type_id'=>$type_id));
//_debug_array($fm_location_cols);
--- 341,345 ----
}
! $fm_location_cols =
$this->soadmin_location->read_attrib(array('type_id'=>$type_id,'lookup_type'=>$type_id));
//_debug_array($fm_location_cols);
***************
*** 351,355 ****
if($read_single)
{
! $cols .= ",fm_location" . ($type_id)
.".".$fm_location_cols[$i]['column_name'];
$cols_return[]
= $fm_location_cols[$i]['column_name'];
$uicols['input_type'][] =
'text';
--- 349,353 ----
if($read_single)
{
! $cols .= ",fm_location" .
$fm_location_cols[$i]['location_type']
.".".$fm_location_cols[$i]['column_name'];
$cols_return[]
= $fm_location_cols[$i]['column_name'];
$uicols['input_type'][] =
'text';
***************
*** 550,553 ****
--- 548,555 ----
if($value)
{
+ if($input_name=='cat_id')
+ {
+ $input_name='category';
+ }
$cols[] = $input_name;
$vals[] = $value;
***************
*** 579,582 ****
--- 581,588 ----
if($value)
{
+ if($input_name=='cat_id')
+ {
+ $input_name='category';
+ }
$vals[] = "$input_name = '$value'";
}
Index: class.uilocation.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uilocation.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** class.uilocation.inc.php 15 Jun 2003 19:41:26 -0000 1.10
--- class.uilocation.inc.php 16 Jun 2003 08:53:22 -0000 1.11
***************
*** 468,471 ****
--- 468,472 ----
$additional_fields[$j]['value'] =
$values[$additional_fields[$j]['input_name']];
$insert_record[]
= $additional_fields[$j]['input_name'];
+ $insert_record[]
= 'cat_id';
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.bolocation.inc.php,1.8,1.9 class.soadmin_location.inc.php,1.8,1.9 class.solocation.inc.php,1.6,1.7 class.uilocation.inc.php,1.10,1.11,
Sigurd Nes <address@hidden> <=