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

Add 'None' option to calendar display options

Browse Source
This commit is contained in:
Nathan Gray 2015-04-15 16:36:12 +00:00
parent 5200176061
commit d853cb7b0f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
infolog/inc/class.infolog_bo.inc.php
View File

@ -1344,7 +1344,7 @@ class infolog_bo
'filter'=> "user$user".($do_events ? 'date' : 'opentoday').$date_wanted, 'filter'=> "user$user".($do_events ? 'date' : 'opentoday').$date_wanted,
'start' => 0, 'start' => 0,
); );
if ($GLOBALS['egw_info']['user']['preferences']['infolog']['cal_show']) if ($GLOBALS['egw_info']['user']['preferences']['infolog']['cal_show'] || $GLOBALS['egw_info']['user']['preferences']['infolog']['cal_show'] === '0')
{ {
$query['col_filter']['info_type'] = explode(',',$GLOBALS['egw_info']['user']['preferences']['infolog']['cal_show']); $query['col_filter']['info_type'] = explode(',',$GLOBALS['egw_info']['user']['preferences']['infolog']['cal_show']);
} }

2
infolog/inc/class.infolog_hooks.inc.php
View File

@ -451,7 +451,7 @@ class infolog_hooks
'type' => 'multiselect', 'type' => 'multiselect',
'label' => 'Which types should the calendar show', 'label' => 'Which types should the calendar show',
'name' => 'cal_show', 'name' => 'cal_show',
'values' => $info->enums['type'], 'values' => array(0 => lang('None')) + $info->enums['type'],
'help' => 'Can be used to show further InfoLog types in the calendar or limit it to show eg. only tasks.', 'help' => 'Can be used to show further InfoLog types in the calendar or limit it to show eg. only tasks.',
'xmlrpc' => True, 'xmlrpc' => True,
'admin' => False, 'admin' => False,