holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Change resources preference option back

Browse Source 
- Fix default to be resources with conflicts
This commit is contained in:
nathangray 2018-11-28 09:40:09 -07:00
parent 4ec54ffd36
commit e10905988a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calendar/inc/class.calendar_hooks.inc.php
View File

@ -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(

2
resources/inc/class.resources_bo.inc.php
View File

@ -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) {