extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-29 03:13:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

add locations category required for CalDAV to distinguish between locations and resources, when updating from 1.8

Browse Source
This commit is contained in:
Ralf Becker 2012-03-31 09:34:45 +00:00
parent 83c3cee10d
commit 0d3d77c76c
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
resources/setup/default_records.inc.php
View File

@ -22,6 +22,7 @@ config::save_value('location_cats', $locations_cat_id, 'resources');
$defaultgroup = $GLOBALS['egw_setup']->add_account('Default','Default','Group',False,False); $defaultgroup = $GLOBALS['egw_setup']->add_account('Default','Default','Group',False,False);
$GLOBALS['egw_setup']->add_acl('resources','run',$defaultgroup); $GLOBALS['egw_setup']->add_acl('resources','run',$defaultgroup);
$GLOBALS['egw_setup']->add_acl('resources',"L$cat_id",$defaultgroup,399); $GLOBALS['egw_setup']->add_acl('resources',"L$cat_id",$defaultgroup,399);
$GLOBALS['egw_setup']->add_acl('resources',"L$locations_cat_id",$defaultgroup,399);
// Add two rooms to give user an idea of what resources is... // Add two rooms to give user an idea of what resources is...
$oProc->query("INSERT INTO {$resources_table_prefix} (name,cat_id,bookable,picture_src,accessory_of) VALUES ( 'Meeting room 1',$locations_cat_id,1,'cat_src',-1)"); $oProc->query("INSERT INTO {$resources_table_prefix} (name,cat_id,bookable,picture_src,accessory_of) VALUES ( 'Meeting room 1',$locations_cat_id,1,'cat_src',-1)");

13
resources/setup/tables_update.inc.php
View File

@ -318,7 +318,20 @@ function resources_upgrade1_6()
{ {
return $GLOBALS['setup_info']['resources']['currentver'] = '1.8'; return $GLOBALS['setup_info']['resources']['currentver'] = '1.8';
} }
function resources_upgrade1_8() function resources_upgrade1_8()
{ {
// add location category required for CalDAV to distinguish between locations and resources
$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->cats_table,array('cat_parent' => 0, 'cat_owner' => categories::GLOBAL_ACCOUNT,'cat_access' => 'public','cat_appname' => 'resources','cat_name' => 'Locations','cat_description' => 'This category has been added by setup','last_mod' => time()),false,__LINE__,__FILE__);
$locations_cat_id = $GLOBALS['egw_setup']->db->get_last_insert_id($GLOBALS['egw_setup']->cats_table,'cat_id');
config::save_value('location_cats', $locations_cat_id, 'resources');
// Give default group all rights to this general cat
$defaultgroup = $GLOBALS['egw_setup']->add_account('Default','Default','Group',False,False);
$GLOBALS['egw_setup']->add_acl('resources','run',$defaultgroup);
$GLOBALS['egw_setup']->add_acl('resources',"L$cat_id",$defaultgroup,399);
$GLOBALS['egw_setup']->add_acl('resources',"L$locations_cat_id",$defaultgroup,399);
return $GLOBALS['setup_info']['resources']['currentver'] = '1.9.001'; return $GLOBALS['setup_info']['resources']['currentver'] = '1.9.001';
} }