[eGroupWare-svn] r56097 - in /trunk/calendar: inc/class.calendar_hooks.inc.php setup/tables_update.inc.php

Author: nathangray
Date: Mon May  9 22:18:10 2016
New Revision: 56097

URL: http://svn.stylite.de/viewvc/egroupware?rev=56097&view=rev
Log:
Directly set default resource selection preference

Modified:
    trunk/calendar/inc/class.calendar_hooks.inc.php
    trunk/calendar/setup/tables_update.inc.php

Modified: trunk/calendar/inc/class.calendar_hooks.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/inc/class.calendar_hooks.inc.php?rev=56097&r1=56096&r2=56097&view=diff
==============================================================================
--- trunk/calendar/inc/class.calendar_hooks.inc.php (original)
+++ trunk/calendar/inc/class.calendar_hooks.inc.php Mon May  9 22:18:10 2016
@@ -407,7 +407,6 @@
 				'help'		=> 'Default type of resources application selected in the calendar particpants research form.',
 				'xmlrpc'	=> True,
 				'admin'		=> False,
-				'forced'    => 'resources',
 				'default'	=> 'resources'
 			),
 			'default_private' => array(

Modified: trunk/calendar/setup/tables_update.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/setup/tables_update.inc.php?rev=56097&r1=56096&r2=56097&view=diff
==============================================================================
--- trunk/calendar/setup/tables_update.inc.php (original)
+++ trunk/calendar/setup/tables_update.inc.php Mon May  9 22:18:10 2016
@@ -2730,5 +2730,8 @@
 	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_extra', 'cal_extra_value',
 		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';
 }


------------------------------------------------------------------------------
Mobile security can be enabling, not merely restricting. Employees who
bring their own devices (BYOD) to work are irked by the imposition of MDM
restrictions. Mobile Device Manager Plus allows you to control only the
apps on BYO-devices by containerizing them, leaving personal data untouched!
https://ad.doubleclick.net/ddm/clk/304595813;131938128;j