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

[sigurdne]

Update of property/inc

Modified Files:
     Branch: MAIN
            class.soadmin_location.inc.php lines: +24 -37

Log Message:
no message

====================================================
Index: property/inc/class.soadmin_location.inc.php
diff -u property/inc/class.soadmin_location.inc.php:1.10 
property/inc/class.soadmin_location.inc.php:1.11
--- property/inc/class.soadmin_location.inc.php:1.10    Wed May 11 19:27:24 2005
+++ property/inc/class.soadmin_location.inc.php Thu May 12 08:22:44 2005
@@ -716,9 +716,15 @@
                        $OldColumnType          = $this->db->f('datatype');
                        $OldColumnPrecision     = $this->db->f('precision_');

-                       $this->db->transaction_begin();
-
                        $table_def = $this->get_table_def($attrib['type_id']);
+//_debug_array($table_def);
+
+                       if($this->receipt['error'])
+                       {
+                               return $this->receipt;
+                       }
+
+                       $this->db->transaction_begin();

                        $value_set=array(
                                'input_text'    => $attrib['input_text'],
@@ -733,7 +739,7 @@

                        $this->init_process();

-//_debug_array($table_def);
+
                        $this->oProc->m_aTables = $table_def;

                        if($OldColumnName !=$attrib['column_name'])
@@ -836,45 +842,26 @@
                                if($this->db->next_record())
                                {

-                               if(!$precision = $this->db->f('precision_'))
-                               {
-                                       $precision = 
$this->bocommon->translate_datatype_precision($this->db->f('datatype'));
-                               }
+                                       if(!$precision = 
$this->db->f('precision_'))
+                                       {
+                                               $precision = 
$this->bocommon->translate_datatype_precision($this->db->f('datatype'));
+                                       }

-                               $fd[$metadata[$i]['name']] = array(
-                                               'type' => 
$this->bocommon->translate_datatype_insert(stripslashes($this->db->f('datatype'))),
-                                               'precision' => $precision,
-                                               'nullable' => 
stripslashes($this->db->f('nullable')),
-                                               'default' => 
stripslashes($this->db->f('default_value')),
-                                               'scale' => $this->db->f('scale')
-                                               );
-                               unset($precision);
+                                       $fd[$metadata[$i]['name']] = array(
+                                                       'type' => 
$this->bocommon->translate_datatype_insert(stripslashes($this->db->f('datatype'))),
+                                                       'precision' => 
$precision,
+                                                       'nullable' => 
stripslashes($this->db->f('nullable')),
+                                                       'default' => 
stripslashes($this->db->f('default_value')),
+                                                       'scale' => 
$this->db->f('scale')
+                                                       );
+                                       unset($precision);
                                }
-                       }
-
-
-
-/*                     $this->db->query("SELECT * FROM fm_location_attrib 
WHERE type_id=$id");
-
-                       while ($this->db->next_record())
-                       {
-                               if(!$precision = $this->db->f('precision_'))
+                               else
                                {
-                                       $precision = 
$this->bocommon->translate_datatype_precision($this->db->f('datatype'));
+                                       $this->receipt['error'][] = array('msg' 
=> lang('Column %1 is missing from metadata',$metadata[$i]['name']));
                                }
-
-
-                               $fd[stripslashes($this->db->f('column_name'))] 
= array(
-                                               'type' => 
$this->bocommon->translate_datatype_insert(stripslashes($this->db->f('datatype'))),
-                                               'precision' => $precision,
-                                               'nullable' => 
stripslashes($this->db->f('nullable')),
-                                               'default' => 
stripslashes($this->db->f('default_value')),
-                                               'scale' => $this->db->f('scale')
-                                               );
-                               unset($precision);
                        }

-*/
                        $this->db->query("SELECT * FROM fm_location_type WHERE 
id=$id");
                        $this->db->next_record();