[Fmsystem-commits] [9742]

[Torstein]

Revision: 9742
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9742
Author:   vator
Date:     2012-07-05 06:43:09 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/setup/setup.inc.php
    trunk/controller/setup/tables_update.inc.php

Modified: trunk/controller/setup/setup.inc.php
===================================================================
--- trunk/controller/setup/setup.inc.php        2012-07-05 06:42:25 UTC (rev 
9741)
+++ trunk/controller/setup/setup.inc.php        2012-07-05 06:43:09 UTC (rev 
9742)
@@ -1,6 +1,6 @@
 <?php
        $setup_info['controller']['name'] = 'controller';
-       $setup_info['controller']['version'] = '0.1.39';
+       $setup_info['controller']['version'] = '0.1.40';
        $setup_info['controller']['app_order'] = 100;
        $setup_info['controller']['enable'] = 1;
        $setup_info['controller']['app_group']  = 'office';

Modified: trunk/controller/setup/tables_update.inc.php
===================================================================
--- trunk/controller/setup/tables_update.inc.php        2012-07-05 06:42:25 UTC 
(rev 9741)
+++ trunk/controller/setup/tables_update.inc.php        2012-07-05 06:43:09 UTC 
(rev 9742)
@@ -787,4 +787,23 @@
                        return 
$GLOBALS['setup_info']['controller']['currentver'];
                }
        }
-
+       
+       $test[] = '0.1.39';
+       function controller_upgrade0_1_39()
+       {
+               $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+               
+               
$GLOBALS['phpgw_setup']->oProc->DropColumn('controller_control_group_component_list',
 array(), 'component_id');
+                               
+               
$GLOBALS['phpgw_setup']->oProc->AddColumn('controller_control_group_component_list','location_id',array(
+                       'type' => 'int',
+                       'precision' => 4,
+                       'nullable' => false
+               ));
+               
+               if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+               {
+                       $GLOBALS['setup_info']['controller']['currentver'] = 
'0.1.40';
+                       return 
$GLOBALS['setup_info']['controller']['currentver'];
+               }
+       }