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

* Calendar - Remove option to skip resource detection, we always do it now.

Browse Source
This commit is contained in:
nathangray 2018-11-23 10:01:58 -07:00
parent 90a40b06ca
commit a999e6e94f
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -194,9 +194,8 @@ class calendar_hooks
'selected' => lang('Selected users/groups') 'selected' => lang('Selected users/groups')
); );
$defaultresource_sel = array( $defaultresource_sel = array(
'resources_conflict' => lang('resources with conflict detection'), 'resources_conflict' => lang('resources'),
'resources_without_conflict' => lang('resources except conflicting ones'), 'resources_without_conflict' => lang('resources except conflicting ones')
'resources' => lang('resources')
); );
$reset_stati_on_shifts = array( $reset_stati_on_shifts = array(
'no' => lang('Never'), 'no' => lang('Never'),

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

@ -725,9 +725,9 @@ class resources_bo
} }
$list = array(); $list = array();
$data = $this->so->search($criteria,$only_keys,$order_by='name',$extra_cols='',$wildcard='%',$empty,$op='OR',$limit,$filter); $data = $this->so->search($criteria,$only_keys,$order_by='name',$extra_cols='',$wildcard='%',$empty,$op='OR',$limit,$filter);
// maybe we need to check disponibility of the searched resources in the calendar if $pattern ['exec'] contains some extra args // we need to check availability of the searched resources in the calendar if $pattern ['exec'] contains some extra args
$show_conflict=False; $show_conflict=False;
if ($data && $options['exec'] && $GLOBALS['egw_info']['preferences']['calendar']['defaultresource_sel'] !== 'resources') if ($data && $options['exec'])
{ {
// we'll use a cache for resources info taken from database // we'll use a cache for resources info taken from database
static $res_info_cache = array(); static $res_info_cache = array();