extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-31 19:22:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix calendar list filter by custom date interval

Browse Source
This commit is contained in:
Nathan Gray 2014-11-17 15:55:18 +00:00
parent 5f12865701
commit 93d9c0d631
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
calendar/inc/class.calendar_uilist.inc.php
View File

@ -322,7 +322,7 @@ class calendar_uilist extends calendar_ui
break; break;
case 'custom': case 'custom':
$this->first = $search_params['start'] = $params['startdate']; $this->first = $search_params['start'] = $params['startdate'];
$this->last = $search_params['end'] = strtotime('+1 day', $params['enddate'])-1; $this->last = $search_params['end'] = strtotime('+1 day', $this->bo->date2ts($params['enddate']))-1;
$label = $this->bo->long_date($this->first,$this->last); $label = $this->bo->long_date($this->first,$this->last);
break; break;
case 'fixed': case 'fixed':
@ -361,12 +361,6 @@ class calendar_uilist extends calendar_ui
$search_params['start'] = $this->date; $search_params['start'] = $this->date;
break; break;
} }
if ($label)
{
$GLOBALS['egw_info']['flags']['app_header'] .= ': '.$label;
$params['options-filter'] = $this->date_filters;
$params['options-filter'][$params['filter']] = $label; // Add it in, or it will be cleared
}
if ((int) $params['col_filter']['participant']) if ((int) $params['col_filter']['participant'])
{ {
$search_params['users'] = (int) $params['col_filter']['participant']; $search_params['users'] = (int) $params['col_filter']['participant'];
@ -376,6 +370,13 @@ class calendar_uilist extends calendar_ui
$search_params['users'] = explode(',',$this->owner); $search_params['users'] = explode(',',$this->owner);
} }
$rows = $js_integration_data = array(); $rows = $js_integration_data = array();
if ($label)
{
$GLOBALS['egw_info']['flags']['app_header'] .= ': '.$label;
// Add it in as specific option, or it will be cleared
$rows['sel_options']['filter'] = $this->date_filters;
$rows['sel_options']['filter'][$params['filter']] = $label;
}
foreach((array) $this->bo->search($search_params) as $event) foreach((array) $this->bo->search($search_params) as $event)
{ {
if (!$this->bo->check_perms(EGW_ACL_EDIT,$event)) if (!$this->bo->check_perms(EGW_ACL_EDIT,$event))