Directly set default resource selection preference

This commit is contained in:
Nathan Gray 2016-05-09 20:18:10 +00:00
parent 4dd1fd6368
commit d321f78eb1
2 changed files with 3 additions and 1 deletions

View File

@ -407,7 +407,6 @@ class calendar_hooks
'help' => 'Default type of resources application selected in the calendar particpants research form.', 'help' => 'Default type of resources application selected in the calendar particpants research form.',
'xmlrpc' => True, 'xmlrpc' => True,
'admin' => False, 'admin' => False,
'forced' => 'resources',
'default' => 'resources' 'default' => 'resources'
), ),
'default_private' => array( 'default_private' => array(

View File

@ -2730,5 +2730,8 @@ function calendar_upgrade16_1_001()
$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_extra', 'cal_extra_value', $GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_extra', 'cal_extra_value',
array('type' => 'varchar','meta' => 'cfvalue','precision' => '16384','nullable' => False,'default' => '')); array('type' => 'varchar','meta' => 'cfvalue','precision' => '16384','nullable' => False,'default' => ''));
Api\Preferences::change_preference('calendar', 'defaultresource_sel', 'resources', 'addressbook', 'forced');
Api\Preferences::change_preference('calendar', 'defaultresource_sel', 'resources', 'addressbook', 'default');
return $GLOBALS['setup_info']['calendar']['currentver'] = '16.1.002'; return $GLOBALS['setup_info']['calendar']['currentver'] = '16.1.002';
} }