[Fmsystem-commits] [7499] property: insert missing locations from clean install

[Sigurd Nes]

Revision: 7499
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7499
Author:   sigurdne
Date:     2011-08-12 10:49:24 +0000 (Fri, 12 Aug 2011)
Log Message:
-----------
property: insert missing locations from clean install

Modified Paths:
--------------
    trunk/property/setup/default_records.inc.php
    trunk/property/setup/setup.inc.php
    trunk/property/setup/tables_update.inc.php

Modified: trunk/property/setup/default_records.inc.php
===================================================================
--- trunk/property/setup/default_records.inc.php        2011-08-12 08:52:29 UTC 
(rev 7498)
+++ trunk/property/setup/default_records.inc.php        2011-08-12 10:49:24 UTC 
(rev 7499)
@@ -71,7 +71,25 @@
 
 $GLOBALS['phpgw']->locations->add('.jasper', 'JasperReport', 'property', 
$allow_grant = true);
 
+$GLOBALS['phpgw']->locations->add('.invoice.dimb', 'A dimension for 
accounting', 'property');
+$GLOBALS['phpgw']->locations->add('.scheduled_events', 'Scheduled events', 
'property');
 
+$locations = array
+(
+       'property.ticket'       => '.ticket',
+       'property.project'      => '.project',
+       'property.document' => '.document',
+       'fm_vendor'                     => '.vendor',
+       'fm_tenant'                     => '.tenant',
+       'fm_owner'                      => '.owner'
+);
+
+foreach($locations as $dummy => $location)
+{
+       $GLOBALS['phpgw']->locations->add("{$location}.category", 'Categories', 
'property');
+}
+
+
 $GLOBALS['phpgw_setup']->oProc->query("DELETE from phpgw_config WHERE 
config_app='property'");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_config (config_app, 
config_name, config_value) VALUES ('property','meter_table', 'fm_entity_1_1')");
 
@@ -196,12 +214,12 @@
 # fm_request_condition_type
 #
 
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_request_condition_type 
(id, descr, priority_key) VALUES (1, 'safety', 10)");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_request_condition_type 
(id, descr, priority_key) VALUES (2, 'aesthetics', 2)");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_request_condition_type 
(id, descr, priority_key) VALUES (3, 'indoor climate', 5)");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_request_condition_type 
(id, descr, priority_key) VALUES (4, 'consequential damage', 5)");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_request_condition_type 
(id, descr, priority_key) VALUES (5, 'user gratification', 4)");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_request_condition_type 
(id, descr, priority_key) VALUES (6, 'residential environment', 6)");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_request_condition_type 
(id, name, priority_key) VALUES (1, 'safety', 10)");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_request_condition_type 
(id, name, priority_key) VALUES (2, 'aesthetics', 2)");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_request_condition_type 
(id, name, priority_key) VALUES (3, 'indoor climate', 5)");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_request_condition_type 
(id, name, priority_key) VALUES (4, 'consequential damage', 5)");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_request_condition_type 
(id, name, priority_key) VALUES (5, 'user gratification', 4)");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_request_condition_type 
(id, name, priority_key) VALUES (6, 'residential environment', 6)");
 
 
 #

Modified: trunk/property/setup/setup.inc.php
===================================================================
--- trunk/property/setup/setup.inc.php  2011-08-12 08:52:29 UTC (rev 7498)
+++ trunk/property/setup/setup.inc.php  2011-08-12 10:49:24 UTC (rev 7499)
@@ -12,7 +12,7 @@
        */
 
        $setup_info['property']['name']                 = 'property';
-       $setup_info['property']['version']              = '0.9.17.621';
+       $setup_info['property']['version']              = '0.9.17.622';
        $setup_info['property']['app_order']    = 8;
        $setup_info['property']['enable']               = 1;
        $setup_info['property']['app_group']    = 'office';

Modified: trunk/property/setup/tables_update.inc.php
===================================================================
--- trunk/property/setup/tables_update.inc.php  2011-08-12 08:52:29 UTC (rev 
7498)
+++ trunk/property/setup/tables_update.inc.php  2011-08-12 10:49:24 UTC (rev 
7499)
@@ -5368,7 +5368,45 @@
        }
 
 
+
        /**
+       * Update property version from 0.9.17.621 to 0.9.17.622
+       * Add locations missing from clean install
+       * 
+       */
+
+       $test[] = '0.9.17.621';
+       function property_upgrade0_9_17_621()
+       {
+               $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+               $GLOBALS['phpgw']->locations->add('.invoice.dimb', 'A dimension 
for accounting', 'property');
+               $GLOBALS['phpgw']->locations->add('.scheduled_events', 
'Scheduled events', 'property');
+
+               $locations = array
+               (
+                       'property.ticket'       => '.ticket',
+                       'property.project'      => '.project',
+                       'property.document' => '.document',
+                       'fm_vendor'                     => '.vendor',
+                       'fm_tenant'                     => '.tenant',
+                       'fm_owner'                      => '.owner'
+               );
+
+               foreach($locations as $dummy => $location)
+               {
+                       
$GLOBALS['phpgw']->locations->add("{$location}.category", 'Categories', 
'property');
+               }
+
+               if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+               {
+                       $GLOBALS['setup_info']['property']['currentver'] = 
'0.9.17.622';
+                       return $GLOBALS['setup_info']['property']['currentver'];
+               }
+       }
+
+
+       /**
        * Update property version from 0.9.17.607 to 0.9.17.608
        * Add more room for address at tickets
        *