projects
/
timetracker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed holidays display for subgroups.
[timetracker.git]
/
import.php
diff --git
a/import.php
b/import.php
index
3e375c9
..
938fdb3
100644
(file)
--- a/
import.php
+++ b/
import.php
@@
-27,8
+27,7
@@
// +----------------------------------------------------------------------+
require_once('initialize.php');
// +----------------------------------------------------------------------+
require_once('initialize.php');
-import('ttImportHelper');
-import('ttImportHelper2');
+import('ttOrgImportHelper');
import('form.Form');
// Access check.
import('form.Form');
// Access check.
@@
-43,12
+42,8
@@
$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()) {
$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.import')));
if ($request->isPost()) {
- if (defined('SUBGROUP_DEBUG') && isTrue(SUBGROUP_DEBUG)) {
- $import = new ttImportHelper2($err);
- } else {
- $import = new ttImportHelper($err);
- }
- $import->importXml();
+ $importHelper = new ttOrgImportHelper($err);
+ $importHelper->importXml();
if ($err->no()) $msg->add($i18n->get('form.import.success'));
} // isPost
if ($err->no()) $msg->add($i18n->get('form.import.success'));
} // isPost