[Fmsystem-commits] [9490]

[Torstein]

Revision: 9490
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9490
Author:   vator
Date:     2012-06-04 13:11:35 +0000 (Mon, 04 Jun 2012)
Log Message:
-----------


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

Modified: trunk/controller/setup/phpgw_no.lang
===================================================================
--- trunk/controller/setup/phpgw_no.lang        2012-06-04 13:10:10 UTC (rev 
9489)
+++ trunk/controller/setup/phpgw_no.lang        2012-06-04 13:11:35 UTC (rev 
9490)
@@ -3,6 +3,8 @@
 control        controller      no      Kontroll
 controller     common  no      Kontroll
 Register control item  controller      no      Legg til nytt kontrollpunkt
+Edit control item      controller      no      Endre kontrollpunkt
+View control item      controller      no      Vis kontrollpunkt
 control_item_type_1    controller      no      Ved innskriving av kommentar i 
et kommentarfelt
 control_item_type_2    controller      no      Ved innskriving av måling i et 
tekstfelt
 control_item_type_3    controller      no      Ved valg av verdi fra 
nedtrekksliste

Modified: trunk/controller/setup/setup.inc.php
===================================================================
--- trunk/controller/setup/setup.inc.php        2012-06-04 13:10:10 UTC (rev 
9489)
+++ trunk/controller/setup/setup.inc.php        2012-06-04 13:11:35 UTC (rev 
9490)
@@ -1,6 +1,6 @@
 <?php
        $setup_info['controller']['name'] = 'controller';
-       $setup_info['controller']['version'] = '0.1.34';
+       $setup_info['controller']['version'] = '0.1.35';
        $setup_info['controller']['app_order'] = 100;
        $setup_info['controller']['enable'] = 1;
        $setup_info['controller']['app_group']  = 'office';

Modified: trunk/controller/setup/tables_current.inc.php
===================================================================
--- trunk/controller/setup/tables_current.inc.php       2012-06-04 13:10:10 UTC 
(rev 9489)
+++ trunk/controller/setup/tables_current.inc.php       2012-06-04 13:11:35 UTC 
(rev 9490)
@@ -14,7 +14,6 @@
                                'control_area_id' => array('type' => 'int', 
'precision' => 4, 'nullable' => True),
                                'component_type_id' => array('type' => 'int', 
'precision' => 4, 'nullable' => True),
                                'component_id' => array('type' => 'int', 
'precision' => 4, 'nullable' => True),
-                               //'location_code' => array('type' => 'varchar', 
'precision' => 30, 'nullable' => True),
                                'repeat_type' => array('type' => 'int', 
'precision' => 2, 'nullable' => True),
                                'repeat_interval' => array('type' => 'int', 
'precision' => 2, 'nullable' => True),
                                'enabled' => array('type' => 'int', 'precision' 
=> 2, 'nullable' => True)

Modified: trunk/controller/setup/tables_update.inc.php
===================================================================
--- trunk/controller/setup/tables_update.inc.php        2012-06-04 13:10:10 UTC 
(rev 9489)
+++ trunk/controller/setup/tables_update.inc.php        2012-06-04 13:11:35 UTC 
(rev 9490)
@@ -677,4 +677,13 @@
                
                $GLOBALS['setup_info']['controller']['currentver'] = '0.1.34';
                return $GLOBALS['setup_info']['controller']['currentver'];
+       }
+       
+       $test[] = '0.1.34';
+       function controller_upgrade0_1_34()
+       {
+               
$GLOBALS['phpgw_setup']->oProc->DropColumn('controller_control', array(), 
'location_code');
+                               
+               $GLOBALS['setup_info']['controller']['currentver'] = '0.1.35';
+               return $GLOBALS['setup_info']['controller']['currentver'];
        }
\ No newline at end of file