[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.solocation.inc.php, 1.10 class.soa
|
From: |
sigurdne |
|
Subject: |
[Phpgroupware-cvs] property/inc class.solocation.inc.php, 1.10 class.soadmin_location.inc.php, 1.8 class.bocommon.inc.php, 1.11 class.soadmin_entity.inc.php, 1.6 |
|
Date: |
Mon, 9 May 2005 11:17:00 +0200 |
Update of property/inc
Modified Files:
Branch: MAIN
class.solocation.inc.php lines: +7 -2
class.soadmin_location.inc.php lines: +29 -18
class.bocommon.inc.php lines: +12 -0
class.soadmin_entity.inc.php lines: +31 -19
Log Message:
no message
====================================================
Index: property/inc/class.solocation.inc.php
diff -u property/inc/class.solocation.inc.php:1.9
property/inc/class.solocation.inc.php:1.10
--- property/inc/class.solocation.inc.php:1.9 Fri May 6 08:40:26 2005
+++ property/inc/class.solocation.inc.php Mon May 9 09:17:49 2005
@@ -193,6 +193,12 @@
$cols = "fm_location" . ($type_id)
.".location_code";
$cols_return[] = 'location_code';
+ $uicols['input_type'][] = 'hidden';
+ $uicols['name'][] =
'location_code';
+ $uicols['descr'][] =
'dummy';
+ $uicols['statustext'][] = 'dummy';
+ $uicols['exchange'][] = false;
+
for ($i=0; $i<($type_id); $i++)
{
$uicols['input_type'][] =
'text';
@@ -521,7 +527,6 @@
$location_list[$j][$cols_return[$i]] =
$this->db->f($cols_return[$i]);
$value = $this->db->f($cols_return[$i]);
-
if($uicols['cols_return_extra'][$i])
{
if(($uicols['cols_return_extra'][$i]['datatype']=='R' ||
$uicols['cols_return_extra'][$i]['datatype']=='LB') && $value):
====================================================
Index: property/inc/class.soadmin_location.inc.php
diff -u property/inc/class.soadmin_location.inc.php:1.7
property/inc/class.soadmin_location.inc.php:1.8
--- property/inc/class.soadmin_location.inc.php:1.7 Fri May 6 08:40:26 2005
+++ property/inc/class.soadmin_location.inc.php Mon May 9 09:17:49 2005
@@ -661,8 +661,24 @@
$this->db->query("UPDATE fm_location_attrib set
$value_set WHERE type_id = " . $attrib['type_id'] ." AND id=" .
$attrib['id'],__LINE__,__FILE__);
- if($OldColumnName !=$attrib['column_name'])
+// if($OldColumnName !=$attrib['column_name'])
{
+
+ if($attrib['column_info']['type']=='email' &&
!$attrib['column_info']['precision'])
+ {
+ $attrib['column_info']['precision']=64;
+ }
+
+ if($precision =
$this->bocommon->translate_datatype_precision($attrib['column_info']['type']))
+ {
+
$attrib['column_info']['precision']=$precision;
+ }
+
+ if(!$attrib['column_info']['default'])
+ {
+
unset($attrib['column_info']['default']);
+ }
+
$value_set=array(
'column_name' =>
$attrib['column_name'],
'type_id' =>
$attrib['type_id'],
@@ -677,28 +693,24 @@
$this->db->query("UPDATE fm_location_attrib set
$value_set WHERE type_id = " . $attrib['type_id'] ." AND id=" .
$attrib['id'],__LINE__,__FILE__);
- if($attrib['column_info']['type']=='email' &&
!$attrib['column_info']['precision'])
- {
- $attrib['column_info']['precision']=64;
- }
-
$attrib['column_info']['type'] =
$this->bocommon->translate_datatype_insert($attrib['column_info']['type']);
- if($attrib['column_info']['type']=='int' &&
!$attrib['column_info']['precision'])
- {
- $attrib['column_info']['precision']=4;
- }
-
- if(!$attrib['column_info']['default'])
- {
-
unset($attrib['column_info']['default']);
- }
-
$this->init_process();
+ $mini_table_def = array(
+ 'fm_location'.$attrib['type_id'] =>
array(
+ 'fd' => array(
+ $OldColumnName
=>$attrib['column_info']),
+ 'pk' => array(),
+ 'fk' => array(),
+ 'ix' => array(),
+ 'uc' => array()
+ )
+ );
+
+ $this->oProc->GenerateScripts($mini_table_def);
$this->oProc->RenameColumn('fm_location'.$attrib['type_id'], $OldColumnName,
$attrib['column_name']);
$this->oProc->AlterColumn('fm_location'.$attrib['type_id'],$attrib['column_name'],$attrib['column_info']);
-
}
$choice_table ='fm_location_choice';
@@ -720,7 +732,6 @@
. "VALUES ($values)",__LINE__,__FILE__);
}
-
if($attrib['delete_choice'])
{
for
($i=0;$i<count($attrib['delete_choice']);$i++)
====================================================
Index: property/inc/class.bocommon.inc.php
diff -u property/inc/class.bocommon.inc.php:1.10
property/inc/class.bocommon.inc.php:1.11
--- property/inc/class.bocommon.inc.php:1.10 Fri May 6 08:40:26 2005
+++ property/inc/class.bocommon.inc.php Mon May 9 09:17:49 2005
@@ -758,6 +758,18 @@
return $datatype_text[$datatype];
}
+ function translate_datatype_precision($datatype)
+ {
+ $datatype_precision = array(
+ 'R' => 4,
+ 'LB' => 4,
+ 'AB' => 4,
+ 'VENDOR' => 4,
+ 'email' => 64
+ );
+
+ return $datatype_precision[$datatype];
+ }
function save_attributes($values_attribute,$type)
{
====================================================
Index: property/inc/class.soadmin_entity.inc.php
diff -u property/inc/class.soadmin_entity.inc.php:1.5
property/inc/class.soadmin_entity.inc.php:1.6
--- property/inc/class.soadmin_entity.inc.php:1.5 Fri May 6 08:40:26 2005
+++ property/inc/class.soadmin_entity.inc.php Mon May 9 09:17:49 2005
@@ -966,22 +966,9 @@
$this->db->query("UPDATE fm_entity_attribute
set $value_set WHERE entity_id=" . $attrib['entity_id']. " AND cat_id=" .
$attrib['cat_id']. " AND id=" . $attrib['id'],__LINE__,__FILE__);
- if($OldColumnName !=$attrib['column_name'])
+// if($OldColumnName !=$attrib['column_name'])
{
- $value_set=array(
- 'column_name' =>
$attrib['column_name'],
- 'datatype' =>
$attrib['column_info']['type'],
- 'precision_' =>
$attrib['column_info']['precision'],
- 'scale' =>
$attrib['column_info']['scale'],
- 'default_value' =>
$attrib['column_info']['default'],
- 'nullable' =>
$attrib['column_info']['nullable']
- );
-
- $value_set =
$this->bocommon->validate_db_update($value_set);
-
- $this->db->query("UPDATE fm_entity_attribute
set $value_set WHERE entity_id=" . $attrib['entity_id']. " AND cat_id=" .
$attrib['cat_id']. " AND id=" . $attrib['id'],__LINE__,__FILE__);
-
if($attrib['column_info']['type']!='R' &&
$attrib['column_info']['type']!='CH' && $attrib['column_info']['type']!='LB')
{
$this->db->query("DELETE FROM
$choice_table WHERE entity_id=" . $attrib['entity_id']. " AND cat_id=" .
$attrib['cat_id']. " AND attrib_id=" . $attrib['id'],__LINE__,__FILE__);
@@ -992,11 +979,9 @@
$attrib['column_info']['precision']=64;
}
- $attrib['column_info']['type'] =
$this->bocommon->translate_datatype_insert($attrib['column_info']['type']);
-
- if($attrib['column_info']['type']=='int' &&
!$attrib['column_info']['precision'])
+ if($precision =
$this->bocommon->translate_datatype_precision($attrib['column_info']['type']))
{
- $attrib['column_info']['precision']=4;
+
$attrib['column_info']['precision']=$precision;
}
if(!$attrib['column_info']['default'])
@@ -1004,8 +989,35 @@
unset($attrib['column_info']['default']);
}
+ $value_set=array(
+ 'column_name' =>
$attrib['column_name'],
+ 'datatype' =>
$attrib['column_info']['type'],
+ 'precision_' =>
$attrib['column_info']['precision'],
+ 'scale' =>
$attrib['column_info']['scale'],
+ 'default_value' =>
$attrib['column_info']['default'],
+ 'nullable' =>
$attrib['column_info']['nullable']
+ );
+
+ $value_set =
$this->bocommon->validate_db_update($value_set);
+
+ $this->db->query("UPDATE fm_entity_attribute
set $value_set WHERE entity_id=" . $attrib['entity_id']. " AND cat_id=" .
$attrib['cat_id']. " AND id=" . $attrib['id'],__LINE__,__FILE__);
+
+ $attrib['column_info']['type'] =
$this->bocommon->translate_datatype_insert($attrib['column_info']['type']);
+
$this->init_process();
+ $mini_table_def = array(
+ 'fm_entity_'.$attrib['entity_id'] . '_'
. $attrib['cat_id'] => array(
+ 'fd' => array(
+ $OldColumnName
=>$attrib['column_info']),
+ 'pk' => array(),
+ 'fk' => array(),
+ 'ix' => array(),
+ 'uc' => array()
+ )
+ );
+
+ $this->oProc->GenerateScripts($mini_table_def);
$this->oProc->RenameColumn('fm_entity_'.$attrib['entity_id'] . '_' .
$attrib['cat_id'], $OldColumnName, $attrib['column_name']);
$this->oProc->AlterColumn('fm_entity_'.$attrib['entity_id'] . '_' .
$attrib['cat_id'],$attrib['column_name'],$attrib['column_info']);
}
- [Phpgroupware-cvs] property/inc class.solocation.inc.php, 1.10 class.soadmin_location.inc.php, 1.8 class.bocommon.inc.php, 1.11 class.soadmin_entity.inc.php, 1.6, sigurdne, 2005/05/15
- [Phpgroupware-cvs] property/inc class.solocation.inc.php, 1.10 class.soadmin_location.inc.php, 1.8 class.bocommon.inc.php, 1.11 class.soadmin_entity.inc.php, 1.6, sigurdne, 2005/05/16
- [Phpgroupware-cvs] property/inc class.solocation.inc.php, 1.10 class.soadmin_location.inc.php, 1.8 class.bocommon.inc.php, 1.11 class.soadmin_entity.inc.php, 1.6, sigurdne, 2005/05/16
- [Phpgroupware-cvs] property/inc class.solocation.inc.php, 1.10 class.soadmin_location.inc.php, 1.8 class.bocommon.inc.php, 1.11 class.soadmin_entity.inc.php, 1.6,
sigurdne <=
- Prev by Date:
[Phpgroupware-cvs] calendar/help/EN add.php, 1.3 edit_delete.php, 1.3 calendar.php, 1.3 view.php, 1.4
- Next by Date:
[Phpgroupware-cvs] todo/templates/base/images pix.gif, 1.1 navbar.gif, 1.1 navbar.png, 1.1 pix.png, 1.1
- Previous by thread:
[Phpgroupware-cvs] property/inc class.solocation.inc.php, 1.10 class.soadmin_location.inc.php, 1.8 class.bocommon.inc.php, 1.11 class.soadmin_entity.inc.php, 1.6
- Next by thread:
[Phpgroupware-cvs] addressbook/help/DE addressbook.php,1.3
- Index(es):