[Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php,1.49,1.50 class.soadmin_location.inc.php,1.3,1.4

[Sigurd Nes <address@hidden>]

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

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

Index: class.bocommon.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bocommon.inc.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -r1.49 -r1.50
*** class.bocommon.inc.php      29 May 2003 07:42:24 -0000      1.49
--- class.bocommon.inc.php      1 Jun 2003 21:38:06 -0000       1.50
***************
*** 51,54 ****
--- 51,55 ----
                        $this->accounts                 = 
CreateObject('phpgwapi.accounts');
                        $this->acl2                     = 
CreateObject($this->currentapp.'.acl2');
+                       $this->soadmin_location = 
CreateObject($this->currentapp.'.soadmin_location');
                        $this->contacts                 = 
CreateObject('phpgwapi.contacts');
  
***************
*** 570,573 ****
--- 571,583 ----
                        if ($sub == property)
                        {
+                               $location       = 
$this->soadmin_location->select_location_type();
+ 
+                               for ($i=0; $i<count($location); $i++)
+                               {
+                                       
$menu['location'][$i]['sublink_location'] = 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uilocation.index&type_id='
 .$location[$i]['id'] );
+                                       
$menu['location'][$i]['sublang_location'] = $location[$i]['name'];
+                                       
$menu['location'][$i]['statsutext_location'] = $location[$i]['descr'];
+                               }
+ 
                                
$menu['sublink_property']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiproperty.index');
                                $menu['sublang_property']=lang('Property');

Index: class.soadmin_location.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soadmin_location.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.soadmin_location.inc.php      30 May 2003 18:55:08 -0000      1.3
--- class.soadmin_location.inc.php      1 Jun 2003 21:38:06 -0000       1.4
***************
*** 16,20 ****
                        $this->db                       = $GLOBALS['phpgw']->db;
                        $this->db2                      = $this->db;
-                       $this->grants           = 
$GLOBALS['phpgw']->acl->get_grants($this->currentapp);
                        $this->account          = 
$GLOBALS['phpgw_info']['user']['account_id'];
  
--- 16,19 ----
***************
*** 28,32 ****
                        }
  
- 
                }
  
--- 27,30 ----
***************
*** 228,231 ****
--- 226,241 ----
                        if($this->oProc->CreateTable('fm_location'. 
$standard['id'],array('fd' => $fd,'pk' => $pk,'fk' => $fk,'ix' => 
array('location_code'),'uc' => array())))
                        {
+ 
+                               $this->oProc->CreateTable('fm_location'. 
$standard['id'] . '_category', array(
+                               'fd' => array(
+                                       'id' => array('type' => 
'int','precision' => '4','nullable' => False),
+                                       'descr' => array('type' => 
'varchar','precision' => '50','nullable' => True)
+                               ),
+                               'pk' => array('id'),
+                               'fk' => array(),
+                               'ix' => array(),
+                               'uc' => array()));
+ 
+ 
                                $receipt['message'][] = array('msg'     => 
lang('table %1 has been saved','fm_location'. $receipt['id'])        );
                                $this->db->transaction_commit();
***************
*** 297,300 ****
--- 307,311 ----
                        {
                                $this->oProc->DropTable('fm_location' . $id);
+                               $this->oProc->DropTable('fm_location' . $id . 
'_category');
  
                                $table                  = 'fm_location_type';