[Phpgroupware-cvs] property/inc class.soadmin_location.inc.php

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    property
Branch:         
Changes by:     Sigurd Nes <address@hidden>     06/03/02 11:42:51

Modified files:
        inc            : class.soadmin_location.inc.php 

Log message:
        

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.soadmin_location.inc.php.diff?tr1=1.19&tr2=1.20&r1=text&r2=text

Patches:
Index: property/inc/class.soadmin_location.inc.php
diff -u property/inc/class.soadmin_location.inc.php:1.19 
property/inc/class.soadmin_location.inc.php:1.20
--- property/inc/class.soadmin_location.inc.php:1.19    Thu Mar  2 09:58:29 2006
+++ property/inc/class.soadmin_location.inc.php Thu Mar  2 11:42:50 2006
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage admin
-       * @version $Id: class.soadmin_location.inc.php,v 1.19 2006/03/02 
09:58:29 sigurdne Exp $
+       * @version $Id: class.soadmin_location.inc.php,v 1.20 2006/03/02 
11:42:50 sigurdne Exp $
        */
 
        /**
@@ -714,17 +714,19 @@
 
                                $this->oProc->m_odb->transaction_begin();
                                $this->db->transaction_begin();
-                               
if($this->oProc->AddColumn('fm_location'.$values[$column_name],$column_name, 
$column_info))
+                               
if($this->oProc->AddColumn('fm_location'.$values[$column_name],$column_name, 
$column_info) &&
+                                       
$this->oProc->AddColumn('fm_location'.$values[$column_name] . 
'_history',$column_name, $column_info))
                                {
                                        if($column_name=='street_id')
                                        {
                                                
$this->oProc->AddColumn('fm_location'.$values[$column_name],'street_number', 
array('type'=>'varchar','precision'=>10));
+                                               
$this->oProc->AddColumn('fm_location'.$values[$column_name] . 
'_history','street_number', array('type'=>'varchar','precision'=>10));
                                                
$this->oProc->DropColumn('fm_location' .$location_type 
,$table_def['fm_location'.$location_type],'street_number');
+                                               
$this->oProc->DropColumn('fm_location' .$location_type . 
'_history',$table_def['fm_location'.$location_type],'street_number');
                                        }
 
                                        $this->oProc->DropColumn('fm_location' 
.$location_type ,$table_def['fm_location'.$location_type], $column_name);
-                                       $this->oProc->DropColumn('fm_location' 
.$location_type . ' _history',$table_def['fm_location'.$location_type . 
'_history'], $column_name);
-
+                                       $this->oProc->DropColumn('fm_location' 
.$location_type . '_history',$table_def['fm_location'.$location_type . 
'_history'], $column_name);
 
                                        $this->db->query("UPDATE 
fm_location_config set
                                                location_type           = '". 
$values[$column_name]     . "' WHERE column_name='" . $column_name . 
"'",__LINE__,__FILE__);