From: Nik Okuntseff Date: Sun, 11 Nov 2018 17:03:50 +0000 (+0000) Subject: Switched to new export-import with subgroup support. X-Git-Tag: timetracker_1.19-1~654 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=f6c7709e92252811cc6f9997b86ac14e3f0dc4f6;p=timetracker.git Switched to new export-import with subgroup support. --- diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 38980481..e294c882 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.18.12.4417 | Copyright © Anuko | +  Anuko Time Tracker 1.18.12.4418 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/export.php b/export.php index 3d617814..2b52acae 100644 --- a/export.php +++ b/export.php @@ -57,11 +57,11 @@ if ($request->isPost()) { $mime_type = 'application/x-bzip2'; } - if (defined('SUBGROUP_DEBUG') && isTrue(SUBGROUP_DEBUG)) { + //if (defined('SUBGROUP_DEBUG') && isTrue(SUBGROUP_DEBUG)) { $exportHelper = new ttOrgExportHelper(); - } else { - $exportHelper = new ttExportHelper(); - } + //} else { + // $exportHelper = new ttExportHelper(); + //} if ($exportHelper->createDataFile($compress)) { header('Pragma: public'); // This is needed for IE8 to download files over https. header('Content-Type: '.$mime_type); diff --git a/import.php b/import.php index 235924ac..78630866 100644 --- a/import.php +++ b/import.php @@ -43,11 +43,11 @@ $form->addInput(array('type'=>'upload','name'=>'xmlfile','value'=>'browse','maxs $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.import'))); if ($request->isPost()) { - if (defined('SUBGROUP_DEBUG') && isTrue(SUBGROUP_DEBUG)) { +// if (defined('SUBGROUP_DEBUG') && isTrue(SUBGROUP_DEBUG)) { $import = new ttOrgImportHelper($err); - } else { - $import = new ttImportHelper($err); - } +// } else { +// $import = new ttImportHelper($err); +// } $import->importXml(); if ($err->no()) $msg->add($i18n->get('form.import.success')); } // isPost