[Phpgroupware-cvs] property/class.soadmin_location.php, 1.1.1.6

[nomail]

Update of /property
Modified Files:
        Branch: 
          class.soadmin_location.php

date: 2004/05/04 08:42:25;  author: sigurdne;  state: Exp;  lines: +9 -11

Log Message:
no message
=====================================================================
Index: property/class.soadmin_location.php
diff -u property/class.soadmin_location.php:1.1.1.5 
property/class.soadmin_location.php:1.1.1.6
--- property/class.soadmin_location.php:1.1.1.5 Thu Apr 29 07:10:49 2004
+++ property/class.soadmin_location.php Tue May  4 08:42:25 2004
@@ -363,7 +363,7 @@
                                $ColumnName             = 
$dbresult->fields['column_name'];
                                $type_id                = 
$dbresult->fields['type_id'];
 
-                               $this->oProc->DropColumn('fm_location' 
.$type_id ,'', $ColumnName);
+                               $this->oProc->DropColumn('fm_location' 
.$type_id , $ColumnName);
 
                        }
                        else
@@ -599,9 +599,7 @@
 
                function init_process()
                {
-                       $this->oProc                                            
= 
CreateObject('phpgwapi_schema_proc',$GLOBALS['phpgw_data']['server']['db_type']);
-                       $this->oProc->m_odb                                     
= $this->db;
-                       $this->oProc->m_odb->Halt_On_Error      = 'report';
+                       $this->oProc            = 
CreateObject($this->currentapp.'_oproc');
                }
 
 
@@ -627,10 +625,10 @@
                                        if($column_name=='street_id')
                                        {
                                                
$this->oProc->AddColumn('fm_location'.$values[$column_name],'street_number', 
array('type'=>'varchar','precision'=>10));
-                                               
$this->oProc->DropColumn('fm_location' .$location_type ,'','street_number');
+                                               
$this->oProc->DropColumn('fm_location' .$location_type ,'street_number');
                                        }
 
-                                       $this->oProc->DropColumn('fm_location' 
.$location_type ,'', $column_name);
+                                       $this->oProc->DropColumn('fm_location' 
.$location_type ,$column_name);
 
 
                                        $GLOBALS['phpgw']->db->Execute("UPDATE 
fm_location_config set
@@ -652,19 +650,20 @@
 
                function edit_attrib($attrib)
                {
-
                        $attrib['column_name'] = 
$this->functions->db_addslashes($attrib['column_name']);
                        $attrib['input_text'] = 
$this->functions->db_addslashes($attrib['input_text']);
                        $attrib['statustext'] = 
$this->functions->db_addslashes($attrib['statustext']);
                        $attrib['default'] = 
$this->functions->db_addslashes($attrib['default']);
 
+                       $choice_table ='fm_location_choice';
+
                        $dbresult = $GLOBALS['phpgw']->db->Execute("SELECT 
column_name FROM fm_location_attrib WHERE id='" . $attrib['id']. "'");
 
                        $OldColumnName          = 
$dbresult->fields['column_name'];
 
                        $GLOBALS['phpgw']->db->begintrans();
 
-                       if($OldColumnName !=$attrib['column_name'])
+                       if(($OldColumnName !=$attrib['column_name']) || 
($attrib['column_info']['type'] != $dbresult->fields['datatype']))
                        {
                                $value_set=array(
                                        'column_name'           => 
$attrib['column_name'],
@@ -698,12 +697,11 @@
 
                                $this->init_process();
 
-                               
$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']);
+//                             
$this->oProc->RenameColumn('fm_location'.$attrib['type_id'], $OldColumnName, 
$attrib['column_name']);
+                               
$this->oProc->AlterColumn('fm_location'.$attrib['type_id'],$attrib['column_name'],$OldColumnName,$attrib['column_info']);
 
                        }
 
-                       $choice_table ='fm_location_choice';
 
                        if($attrib['new_choice'])
                        {