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

Add missing conversion to human values

Browse Source
This commit is contained in:
nathangray 2016-05-16 17:26:15 -06:00
parent fb8612f9fd
commit 1a16869651
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
calendar/inc/class.calendar_merge.inc.php
View File

@ -245,6 +245,19 @@ class calendar_merge extends Api\Storage\Merge
} else {
$event = $id;
}
$record = new calendar_egw_record($event['id']);
// Convert to human friendly values
$types = calendar_egw_record::$types;
importexport_export_csv::convert($record, $types, 'calendar');
$array = $record->get_record_array();
foreach($array as $key => $value)
{
$replacements['$$'.($prefix?$prefix.'/':'').$key.'$$'] = $value;
}
$replacements['$$' . ($prefix ? $prefix . '/' : '') . 'calendar_id'. '$$'] = $event['id'];
foreach($this->bo->event2array($event) as $name => $data)
{
@ -306,12 +319,6 @@ class calendar_merge extends Api\Storage\Merge
$this->cf_link_to_expand($event, $content, $replacements);
}
$custom = Api\Storage\Customfields::get('calendar');
foreach(array_keys($custom) as $name)
{
$replacements['$$'.($prefix?$prefix.'/':'').'#'.$name.'$$'] = $event['#'.$name];
}
// Links
$replacements += $this->get_all_links('calendar', $event['id'], $prefix, $content);