From d853cb7b0ff773b128339be6fe4253639489481c Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Wed, 15 Apr 2015 16:36:12 +0000 Subject: [PATCH] Add 'None' option to calendar display options --- infolog/inc/class.infolog_bo.inc.php | 2 +- infolog/inc/class.infolog_hooks.inc.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/infolog/inc/class.infolog_bo.inc.php b/infolog/inc/class.infolog_bo.inc.php index d8507d0cde..89104cc895 100644 --- a/infolog/inc/class.infolog_bo.inc.php +++ b/infolog/inc/class.infolog_bo.inc.php @@ -1344,7 +1344,7 @@ class infolog_bo 'filter'=> "user$user".($do_events ? 'date' : 'opentoday').$date_wanted, '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']); } diff --git a/infolog/inc/class.infolog_hooks.inc.php b/infolog/inc/class.infolog_hooks.inc.php index d2bb586956..e6dfcfea07 100644 --- a/infolog/inc/class.infolog_hooks.inc.php +++ b/infolog/inc/class.infolog_hooks.inc.php @@ -451,7 +451,7 @@ class infolog_hooks 'type' => 'multiselect', 'label' => 'Which types should the calendar 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.', 'xmlrpc' => True, 'admin' => False,