extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-05 09:32:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Adjust custom date selection to include the full end date

Browse Source 
Affects list view 'Selected range' and export range selection
This commit is contained in:
Nathan Gray 2012-10-04 22:32:26 +00:00
parent 7925e33c6f
commit b16302e090
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_export_csv.inc.php
View File

@ -36,7 +36,7 @@ class calendar_export_csv implements importexport_iface_export_plugin {
if($options['selection']['select'] == 'criteria') {
$query = array(
'start' => $options['selection']['start'],
'end' => $options['selection']['end'],
'end' => strtotime('+1 day',$options['selection']['end'])-1,
'categories' => $options['categories'] ? $options['categories'] : $options['selection']['categories'],
//'enum_recuring' => false, // we want the recurring events enumerated for csv export
'daywise' => false,

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

@ -291,7 +291,7 @@ class calendar_uilist extends calendar_ui
case 'custom':
$GLOBALS['egw']->js->set_onload("set_style_by_class('table','custom_hide','visibility','visible');");
$this->first = $search_params['start'] = $params['startdate'];
$this->last = $search_params['end'] = $params['enddate'];
$this->last = $search_params['end'] = strtotime('+1 day', $params['enddate'])-1;
$label = $this->bo->long_date($this->first,$this->last);
break;
case 'fixed':