[Phpgroupware-cvs] property/inc class.bocommon.inc.php, 1.79, 1.80 class.sostandard_entity.inc.php, 1.16, 1.17 class.uistandard_entity.inc.php, 1.16, 1.17 class.uiadmin_location.inc.php, 1.8, 1.9

[Sigurd Nes <address@hidden>]

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

Modified Files:
        class.bocommon.inc.php class.sostandard_entity.inc.php 
        class.uistandard_entity.inc.php class.uiadmin_location.inc.php 
Log Message:
no message

Index: class.uiadmin_location.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiadmin_location.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** class.uiadmin_location.inc.php      27 Aug 2003 16:35:12 -0000      1.8
--- class.uiadmin_location.inc.php      26 Sep 2003 18:57:11 -0000      1.9
***************
*** 554,558 ****
                                '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);
--- 554,558 ----
                                'value_list'                    => 
$values['list'],
                                'lang_list'                             => 
lang('show in list'),
!                               'lang_list_statustext'                  => 
lang('check to show this attribute in location list')
                        );
  //_debug_array($data);

Index: class.bocommon.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bocommon.inc.php,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** class.bocommon.inc.php      26 Sep 2003 18:04:34 -0000      1.79
--- class.bocommon.inc.php      26 Sep 2003 18:57:11 -0000      1.80
***************
*** 54,57 ****
--- 54,59 ----
                        $this->contacts                 = 
CreateObject('phpgwapi.contacts');
  
+                       $this->join                     = $this->socommon->join;
+ 
  
                        switch($GLOBALS['phpgw_info']['server']['db_type'])

Index: class.sostandard_entity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sostandard_entity.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** class.sostandard_entity.inc.php     26 Sep 2003 18:04:34 -0000      1.16
--- class.sostandard_entity.inc.php     26 Sep 2003 18:57:11 -0000      1.17
***************
*** 322,325 ****
--- 322,326 ----
                                $attrib['type_name']    = 
$this->db->f('type_name');
                                $attrib['datatype']     = 
$this->db->f('datatype');
+                               $attrib['list'] = $this->db->f('list');
                                if($this->db->f('datatype')=='R' || 
$this->db->f('datatype')=='CH')
                                {
***************
*** 376,381 ****
                                $attrib['descr'] = 
$this->db->db_addslashes($attrib['descr']);
  
!                               $this->db->query("INSERT INTO $table (id, 
type_id, name, descr, datatype) "
!                                       . "VALUES ('" . $attrib['id'] . "','" . 
$attrib['type_id'] . "','" . $attrib['name'] . "','" . $attrib['descr'] . "','" 
. $attrib['datatype']. "')",__LINE__,__FILE__);
  
                                $receipt['id']=$attrib['id'];
--- 377,394 ----
                                $attrib['descr'] = 
$this->db->db_addslashes($attrib['descr']);
  
! 
!                       $values= array(
!                               $attrib['id'],
!                               $attrib['type_id'],
!                               $attrib['name'],
!                               $attrib['descr'],
!                               $attrib['datatype'],
!                               $attrib['list']
!                               );
! 
!                       $values = $this->bocommon->validate_db_insert($values);
! 
!                               $this->db->query("INSERT INTO $table (id, 
type_id, name, descr, datatype,list) "
!                                       . "VALUES ($values)",__LINE__,__FILE__);
  
                                $receipt['id']=$attrib['id'];
***************
*** 416,421 ****
                                $attrib['descr'] = 
$this->db->db_addslashes($attrib['descr']);
  
!                               $this->db->query("UPDATE $table set descr='" . 
$attrib['descr'] . "', name='". $attrib['name'] . "', type_id='". 
$attrib['type_id'] . "', datatype='". $attrib['datatype']
!                                       . "' WHERE id='" . $attrib['id']. 
"'",__LINE__,__FILE__);
  
                                if($attrib['new_choice'])
--- 429,443 ----
                                $attrib['descr'] = 
$this->db->db_addslashes($attrib['descr']);
  
!                               $value_set=array(
!                                       'descr'         => $attrib['descr'],
!                                       'name'          => $attrib['name'],
!                                       'type_id'       => $attrib['type_id'],
!                                       'datatype'      => $attrib['datatype'],
!                                       'list'          => $attrib['list']
!                                       );
! 
!                               $value_set      = 
$this->bocommon->validate_db_update($value_set);
! 
!                               $this->db->query("UPDATE $table set $value_set 
WHERE id=" . $attrib['id'],__LINE__,__FILE__);
  
                                if($attrib['new_choice'])

Index: class.uistandard_entity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uistandard_entity.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** class.uistandard_entity.inc.php     24 Sep 2003 15:40:50 -0000      1.16
--- class.uistandard_entity.inc.php     26 Sep 2003 18:57:11 -0000      1.17
***************
*** 487,491 ****
                                'lang_no_datatype'                      => 
lang('No datatype'),
                                'datatype_list'                         => 
$this->bo->select_datatype($attrib['datatype']),
!                               'select_datatype'                       => 
'values[datatype]'
                        );
  //_debug_array($data);
--- 487,494 ----
                                'lang_no_datatype'                      => 
lang('No datatype'),
                                'datatype_list'                         => 
$this->bo->select_datatype($attrib['datatype']),
!                               'select_datatype'                       => 
'values[datatype]',
!                               'value_list'                            => 
$values['list'],
!                               'lang_list'                                     
=> lang('show in list'),
!                               'lang_list_statustext'          => lang('check 
to show this attribute in list')
                        );
  //_debug_array($data);