holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ImportExport: Fix custom dates formatting to work for more than just the first row

Browse Source
This commit is contained in:
nathangray 2020-09-10 11:39:25 -06:00
parent 372eadcff3
commit edaf3abd4f
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
importexport/inc/class.importexport_export_csv.inc.php
View File

@ -246,24 +246,23 @@ class importexport_export_csv implements importexport_iface_export_record
switch($c_field['type']) { switch($c_field['type']) {
case 'date': case 'date':
case 'date-time': case 'date-time':
$fields[$c_field['type']][] = $name;
if ($c_field['values']['format'] && (is_array($record) ? $record[$name] : $record->$name)) if ($c_field['values']['format'] && (is_array($record) ? $record[$name] : $record->$name))
{ {
// Date has custom format. Convert so it's standard. // Date has custom format. Convert so it's standard, don't do normal processing
$val = is_array($record) ? $record[$name] : $record->$name; $format = $c_field['values']['format'];
$date = Api\DateTime::createFromFormat($c_field['values']['format'], $val, Api\DateTime::$user_timezone); $methods[$name] = function($val) use ($format)
if($date)
{ {
$val = $date->format(APi\DateTime::DATABASE); $date = Api\DateTime::createFromFormat($format, $val, Api\DateTime::$user_timezone);
if (is_array($record)) if($date)
{ {
$record[$name] = $val; return $date->format(APi\DateTime::DATABASE);
} }
else };
{ }
$record->$name = $val; else
} {
} // Process as normal
$fields[$c_field['type']][] = $name;
} }
break; break;
case 'select-account': case 'select-account':
@ -442,7 +441,17 @@ class importexport_export_csv implements importexport_iface_export_record
// Some custom methods for conversion // Some custom methods for conversion
foreach((array)$methods as $name => $method) { foreach((array)$methods as $name => $method) {
if($record->$name) $record->$name = ExecMethod($method, $record->$name); if ($record->$name)
{
if(is_string($method))
{
$record->$name = ExecMethod($method, $record->$name);
}
else if (is_callable($method))
{
$record->$name = $method($record->$name);
}
}
} }
static $cat_object; static $cat_object;