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

Fix some problems with calendar export causing a blank export popup

Browse Source 
- missing template
- bad format on end date
This commit is contained in:
Nathan Gray 2014-04-30 16:54:47 +00:00
parent b79ff8d4ed
commit 3eaf87f78f
2 changed files with 58 additions and 1 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

@ -285,7 +285,7 @@ class calendar_export_csv implements importexport_iface_export_plugin {
'selection' => $prefs['selection'] ? $prefs['selection'] : 'criteria', 'selection' => $prefs['selection'] ? $prefs['selection'] : 'criteria',
'criteria' => array( 'criteria' => array(
'start' => is_object($start) ? $start->format('ts') : $start, 'start' => is_object($start) ? $start->format('ts') : $start,
'end' => $end, 'end' => is_object($end) ? $end->format('ts') : $end,
'owner' => $states['owner'] 'owner' => $states['owner']
) )
) )

57
calendar/templates/default/export_csv_select.xet Normal file
View File

@ -0,0 +1,57 @@
<?xml version="1.0"?>
<!-- $Id$ -->
<overlay>
<template id="calendar.export_csv_select" template="" lang="" group="0" version="1.9.003">
<grid>
<columns>
<column width="150"/>
<column/>
</columns>
<rows>
<row disabled="!@msg">
<description id="msg" span="all" class="message"/>
<description/>
</row>
<row>
<radio label="Use search results" id="selection" options="search_results" span="all"/>
</row>
<row>
<radio label="Use definition filter" id="selection" onclick="jQuery('div.filters').show();jQuery('.criteria').hide();" options="filter" span="all"/>
</row>
<row>
<radio label="Use given criteria:" id="selection" onchange="jQuery('.criteria').show();jQuery('div.filters').hide();" options="criteria" span="all"/>
</row>
<row>
<grid class="criteria" id="criteria">
<columns>
<column/>
<column/>
</columns>
<rows>
<row>
<description value="Start" font_style="1"/>
<date statustext="Startdate of the export" id="start"/>
</row>
<row>
<description value="End"/>
<date statustext="Enddate of the export" id="end"/>
</row>
<row>
<listbox type="select-account" id="owner" rows="5" options="both" span="2" class="shorter"/>
</row>
</rows>
</grid>
</row>
<row>
<description/>
<description/>
</row>
</rows>
</grid>
<styles>
.shorter select {
width: 170px;
}
</styles>
</template>
</overlay>