[Phpgroupware-cvs] CVS: property/inc class.soadmin_location.inc.php,1.11,1.12 class.uiadmin_location.inc.php,1.4,1.5

[Sigurd Nes <address@hidden>]

Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv5234/inc

Modified Files:
        class.soadmin_location.inc.php class.uiadmin_location.inc.php 
Log Message:
no message

Index: class.soadmin_location.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soadmin_location.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** class.soadmin_location.inc.php      24 Jun 2003 13:07:40 -0000      1.11
--- class.soadmin_location.inc.php      28 Jun 2003 20:29:53 -0000      1.12
***************
*** 428,431 ****
--- 428,433 ----
                                $attrib['type_id']                              
        = $this->db->f('type_id');
                                $attrib['type_name']                            
= $this->db->f('type_name');
+                               $attrib['lookup_form']                          
= $this->db->f('lookup_form');
+                               $attrib['list']                                 
        = $this->db->f('list');
  
                                return $attrib;
***************
*** 445,449 ****
                        $this->db->transaction_begin();
  
!                       $this->db->query("INSERT INTO fm_location_type_column 
(id,column_name, input_text, statustext, type_id, 
datatype,precision_,scale,default_value,nullable) "
                                . "VALUES ('" .
                                $attrib['id'] . "','" .
--- 447,451 ----
                        $this->db->transaction_begin();
  
!                       $this->db->query("INSERT INTO fm_location_type_column 
(id,column_name, input_text, statustext, type_id,lookup_form,list, 
datatype,precision_,scale,default_value,nullable) "
                                . "VALUES ('" .
                                $attrib['id'] . "','" .
***************
*** 452,455 ****
--- 454,459 ----
                                $attrib['statustext'] . "','" .
                                $attrib['type_id'] . "','" .
+                               $attrib['lookup_form'] . "','" .
+                               $attrib['list'] . "','" .
                                $attrib['column_info']['type'] . "','" .
                                $attrib['column_info']['precision'] . "','" .
***************
*** 458,461 ****
--- 462,466 ----
                                $attrib['column_info']['nullable']. 
"')",__LINE__,__FILE__);
  
+ 
                        $receipt['id']= $attrib['id'];
  
***************
*** 560,563 ****
--- 565,570 ----
                                statustext              = '". 
$attrib['statustext'] . "',
                                type_id                 = '". 
$attrib['type_id'] . "',
+                               lookup_form             = '". 
$attrib['lookup_form'] . "',
+                               list                    = '". $attrib['list'] . 
"',
                                datatype                = '". 
$attrib['column_info']['type'] . "',
                                precision_              = '". 
$attrib['column_info']['precision'] . "',

Index: class.uiadmin_location.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiadmin_location.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.uiadmin_location.inc.php      13 Jun 2003 11:09:51 -0000      1.4
--- class.uiadmin_location.inc.php      28 Jun 2003 20:29:53 -0000      1.5
***************
*** 547,550 ****
--- 547,556 ----
                                'lang_select_nullable'          => lang('Select 
nullable'),
                                'nullable_list'                         => 
$this->bo->select_nullable($values['column_info']['nullable']),
+                               'value_lookup_form'                     => 
$values['lookup_form'],
+                               'lang_lookup_form'                              
=> lang('show in lookup forms'),
+                               'lang_lookup_form_statustext'                   
=> lang('check to show this attribue in lookup forms'),
+                               'value_list'                    => 
$values['list'],
+                               'lang_list'                             => 
lang('show in list'),
+                               'lang_list_statustext'                  => 
lang('check to show this attribue in location list'),
                        );
  //_debug_array($data);