From e10905988a6b59eab1c7a2e1cf79e7fc53365b51 Mon Sep 17 00:00:00 2001 From: nathangray Date: Wed, 28 Nov 2018 09:40:09 -0700 Subject: [PATCH] - Change resources preference option back - Fix default to be resources with conflicts --- calendar/inc/class.calendar_hooks.inc.php | 2 +- resources/inc/class.resources_bo.inc.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/calendar/inc/class.calendar_hooks.inc.php b/calendar/inc/class.calendar_hooks.inc.php index 2586cbfeeb..dfb9b13e6e 100644 --- a/calendar/inc/class.calendar_hooks.inc.php +++ b/calendar/inc/class.calendar_hooks.inc.php @@ -194,7 +194,7 @@ class calendar_hooks 'selected' => lang('Selected users/groups') ); $defaultresource_sel = array( - 'resources_conflict' => lang('resources'), + 'resources_conflict' => lang('resources with conflict detection'), 'resources_without_conflict' => lang('resources except conflicting ones') ); $reset_stati_on_shifts = array( diff --git a/resources/inc/class.resources_bo.inc.php b/resources/inc/class.resources_bo.inc.php index f26eca7c54..0558f003a7 100755 --- a/resources/inc/class.resources_bo.inc.php +++ b/resources/inc/class.resources_bo.inc.php @@ -803,7 +803,7 @@ class resources_bo } } if (isset($res_info_cache)) { - $show_conflict= $GLOBALS['egw_info']['user']['preferences']['calendar']['defaultresource_sel'] === 'resources_conflict'; + $show_conflict= $GLOBALS['egw_info']['user']['preferences']['calendar']['defaultresource_sel'] !== 'resources_without_conflict'; // if we have this array indexed on resource id it means non-bookable resource are removed and we are working for calendar // so we'll loop on this one and not $data foreach($res_info_cache as $id => $resource) {