diff --git a/assets/components/formsave/mgr/templates/print/fs.rowdata.tpl b/assets/components/formsave/mgr/templates/print/fs.rowdata.tpl index 2e6d189..b14d110 100644 --- a/assets/components/formsave/mgr/templates/print/fs.rowdata.tpl +++ b/assets/components/formsave/mgr/templates/print/fs.rowdata.tpl @@ -1,4 +1,4 @@ [[+key]] - [[+key:eq=`time`:then=`[[+value:date=`%Y-%m-%d %H:%M`]]`:else=`[[+value:nl2br]]`]] + [[+key:eq=`timeFormSave`:then=`[[+value:date=`%Y-%m-%d %H:%M`]]`:else=`[[+value:nl2br]]`]] diff --git a/assets/components/formsave/mgr/templates/print/fs.rowwrapper.tpl b/assets/components/formsave/mgr/templates/print/fs.rowwrapper.tpl index 5c3f4b8..88f73b5 100644 --- a/assets/components/formsave/mgr/templates/print/fs.rowwrapper.tpl +++ b/assets/components/formsave/mgr/templates/print/fs.rowwrapper.tpl @@ -1,5 +1,5 @@ -

[[+formData.time:date=`%Y/%m/%d %H:%M`]]

+

[[+formData.timeFormSave:date=`%Y/%m/%d %H:%M`]]

[[+content]] diff --git a/core/components/formsave/processors/mgr/form/export.php b/core/components/formsave/processors/mgr/form/export.php index 41b6639..f7ed005 100644 --- a/core/components/formsave/processors/mgr/form/export.php +++ b/core/components/formsave/processors/mgr/form/export.php @@ -73,7 +73,13 @@ $output = ''; foreach ($forms as $form) { - $formData = array_merge($form->toArray(), $form->get('data')); + + $formData = $form->toArray(); + // "time" field renamed to unique "timeFormSave" name to eliminate conflict beetween previous "time" name and "time" field inj saved forms + $formData['timeFormSave'] = $formData['time']; + unset($formData['time']); + $formData = array_merge($formData, $form->get('data')); + $rowOutput = ''; $count = 0; foreach($formData as $key => $value) {