[Fmsystem-commits] [8264] Controller: Fix install

[Sigurd Nes]

Revision: 8264
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8264
Author:   sigurdne
Date:     2011-12-09 15:41:52 +0000 (Fri, 09 Dec 2011)
Log Message:
-----------
Controller: Fix install

Modified Paths:
--------------
    trunk/controller/setup/default_records.inc.php
    trunk/controller/setup/setup.inc.php
    trunk/controller/setup/tables_current.inc.php

Modified: trunk/controller/setup/default_records.inc.php
===================================================================
--- trunk/controller/setup/default_records.inc.php      2011-12-09 14:57:49 UTC 
(rev 8263)
+++ trunk/controller/setup/default_records.inc.php      2011-12-09 15:41:52 UTC 
(rev 8264)
@@ -7,7 +7,7 @@
  */
 
 // clean up from previous install
-$GLOBALS['phpgw_setup']->oProc->query("SELECT app_id FROM phpgw_applications 
WHERE app_name = 'controller'");
+/*$GLOBALS['phpgw_setup']->oProc->query("SELECT app_id FROM phpgw_applications 
WHERE app_name = 'controller'");
 $GLOBALS['phpgw_setup']->oProc->next_record();
 $app_id = $GLOBALS['phpgw_setup']->oProc->f('app_id');
 
@@ -30,8 +30,8 @@
 
 
 unset($locations);
+*/
 
-
 //Create groups, users, add users to groups and set preferences
 $GLOBALS['phpgw']->locations->add('.',                         'Root',         
        'controller',false);
 $GLOBALS['phpgw']->locations->add('admin',                     'Admin',        
        'controller',false);

Modified: trunk/controller/setup/setup.inc.php
===================================================================
--- trunk/controller/setup/setup.inc.php        2011-12-09 14:57:49 UTC (rev 
8263)
+++ trunk/controller/setup/setup.inc.php        2011-12-09 15:41:52 UTC (rev 
8264)
@@ -41,5 +41,7 @@
                'controller_check_list',
                'controller_procedure',
                'controller_control_area',
-               'controller_control_group_list'
+               'controller_control_group_list',
+               'controller_control_location_list',
+               'controller_control_equipment_list'
        );

Modified: trunk/controller/setup/tables_current.inc.php
===================================================================
--- trunk/controller/setup/tables_current.inc.php       2011-12-09 14:57:49 UTC 
(rev 8263)
+++ trunk/controller/setup/tables_current.inc.php       2011-12-09 15:41:52 UTC 
(rev 8264)
@@ -137,24 +137,24 @@
                        'ix' => array(),
                        'uc' => array()
                ),
-               'controller_control_location_list', array(
+               'controller_control_location_list' => array(
                        'fd' => array(
                                'id' => array('type' => 'auto', 'nullable' => 
false),
                                        'control_id' => array('type' => 'int', 
'precision' => '4', 'nullable' => false),
                                        'location_code' => array('type' => 
'int', 'precision' => '4', 'nullable' => false)
                                ),
-                               'pk' => array('id'),
+                       'pk' => array('id'),
                        'fk' => array(),
                        'ix' => array(),
                        'uc' => array()
                ),
-               'controller_control_equipment_list', array(
+               'controller_control_equipment_list' => array(
                                'fd' => array(
                                        'id' => array('type' => 'auto', 
'nullable' => false),
                                        'control_id' => array('type' => 'int', 
'precision' => '4', 'nullable' => false),
                                        'equipment_id' => array('type' => 
'int', 'precision' => '4', 'nullable' => false)
                                ),
-                               'pk' => array('id'),
+                       'pk' => array('id'),
                        'fk' => array(),
                        'ix' => array(),
                        'uc' => array()