diff --git a/module/caselib/control.php b/module/caselib/control.php index cdbcd4cee3..6464c37f9c 100644 --- a/module/caselib/control.php +++ b/module/caselib/control.php @@ -547,7 +547,7 @@ class caselib extends control if(count($columnKey) != count($header)) die(js::alert($this->lang->testcase->errorEncode)); } - $this->session->set('importFile', $fileName); + $this->session->set('fileImport', $fileName); die(js::locate(inlink('showImport', "libID=$libID"), 'parent.parent')); } @@ -567,7 +567,7 @@ class caselib extends control { $this->loadModel('testcase'); - $file = $this->session->importFile; + $file = $this->session->fileImport; $tmpPath = $this->loadModel('file')->getImportTmp(); $tmpFile = $tmpPath . DS . md5(basename($file)); @@ -744,8 +744,8 @@ class caselib extends control if(empty($caseData)) { - unlink($this->session->importFile); - unset($_SESSION['importFile']); + unlink($this->session->fileImport); + unset($_SESSION['fileImport']); echo js::alert($this->lang->error->noData); die(js::locate($this->createLink('caselib', 'browse', "libID=$libID"))); } diff --git a/module/caselib/model.php b/module/caselib/model.php index 746cf9eddd..5496c47c43 100644 --- a/module/caselib/model.php +++ b/module/caselib/model.php @@ -91,7 +91,7 @@ class caselibModel extends model if(common::hasPriv('caselib', 'import')) { $link = helper::createLink('caselib', 'import', "libID=$libID"); - $pageActions .= html::a($link, " " . $this->lang->testcase->importFile, '', "class='btn btn-link export'"); + $pageActions .= html::a($link, " " . $this->lang->testcase->fileImport, '', "class='btn btn-link export'"); } $pageActions .= ''; $params = "libID=$libID&moduleID=" . (isset($moduleID) ? $moduleID : 0); @@ -565,8 +565,8 @@ class caselibModel extends model if($this->post->isEndPage) { - unlink($this->session->importFile); - unset($_SESSION['importFile']); + unlink($this->session->fileImport); + unset($_SESSION['fileImport']); } } diff --git a/module/caselib/view/browse.html.php b/module/caselib/view/browse.html.php index 6293eaab65..a7b4b04751 100644 --- a/module/caselib/view/browse.html.php +++ b/module/caselib/view/browse.html.php @@ -54,7 +54,7 @@ js::set('flow', $config->global->flow);
" . $lang->caselib->exportTemplet, '', "class='btn btn-link export' data-width='35%'");?> - " . $lang->testcase->importFile, '', "class='btn btn-link export'");?> + " . $lang->testcase->fileImport, '', "class='btn btn-link export'");?>
" . $lang->testcase->batchCreate, '', "class='btn btn-secondary'");?> diff --git a/module/caselib/view/import.html.php b/module/caselib/view/import.html.php index 47f1f773a5..07204c6800 100644 --- a/module/caselib/view/import.html.php +++ b/module/caselib/view/import.html.php @@ -3,7 +3,7 @@
-

testcase->importFile;?>

+

testcase->fileImport;?>

diff --git a/module/testcase/control.php b/module/testcase/control.php index c0a959fa30..4083ad9e9f 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -1419,7 +1419,7 @@ class testcase extends control if(count($columnKey) == 0) die(js::alert($this->lang->testcase->errorEncode)); } - $this->session->set('importFile', $fileName); + $this->session->set('fileImport', $fileName); die(js::locate(inlink('showImport', "productID=$productID&branch=$branch"), 'parent.parent')); } @@ -1509,7 +1509,7 @@ class testcase extends control */ public function showImport($productID, $branch = 0, $pagerID = 1, $maxImport = 0) { - $file = $this->session->importFile; + $file = $this->session->fileImport; $tmpPath = $this->loadModel('file')->getImportTmp(); $tmpFile = $tmpPath . DS . md5(basename($file)); diff --git a/module/testcase/lang/de.php b/module/testcase/lang/de.php index de27bf0329..1eaa586057 100644 --- a/module/testcase/lang/de.php +++ b/module/testcase/lang/de.php @@ -105,7 +105,7 @@ $lang->testcase->browse = "Fälle"; $lang->testcase->groupCase = "Nach Gruppe"; $lang->testcase->import = "Importieren"; $lang->testcase->importAction = "Import Case"; -$lang->testcase->importFile = "Importiere CSV"; +$lang->testcase->fileImport = "Importiere CSV"; $lang->testcase->importFromLib = "Import aus Bibliothek"; $lang->testcase->showImport = "Import Anzeigen"; $lang->testcase->exportTemplet = "Export Vorlage"; diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php index 4520ff52e7..f6654283ee 100644 --- a/module/testcase/lang/en.php +++ b/module/testcase/lang/en.php @@ -105,7 +105,7 @@ $lang->testcase->browse = "Case List"; $lang->testcase->groupCase = "View By Group"; $lang->testcase->import = "Import"; $lang->testcase->importAction = "Import Case"; -$lang->testcase->importFile = "Import CSV"; +$lang->testcase->fileImport = "Import CSV"; $lang->testcase->importFromLib = "Import From Library"; $lang->testcase->showImport = "Show Import"; $lang->testcase->exportTemplet = "Export Template"; diff --git a/module/testcase/lang/fr.php b/module/testcase/lang/fr.php index d042a55377..b7628d168f 100644 --- a/module/testcase/lang/fr.php +++ b/module/testcase/lang/fr.php @@ -105,7 +105,7 @@ $lang->testcase->browse = "Liste CasTests"; $lang->testcase->groupCase = "Vue par Groupe"; $lang->testcase->import = "Importer"; $lang->testcase->importAction = "Importer CasTest"; -$lang->testcase->importFile = "Importer CSV"; +$lang->testcase->fileImport = "Importer CSV"; $lang->testcase->importFromLib = "Importer de la Library"; $lang->testcase->showImport = "Voir Import"; $lang->testcase->exportTemplet = "Exporter Modèle"; diff --git a/module/testcase/lang/vi.php b/module/testcase/lang/vi.php index 20c55db7b5..418693d528 100644 --- a/module/testcase/lang/vi.php +++ b/module/testcase/lang/vi.php @@ -105,7 +105,7 @@ $lang->testcase->browse = "Danh sách tình huống"; $lang->testcase->groupCase = "Xem theo Nhóm"; $lang->testcase->import = "Nhập"; $lang->testcase->importAction = "Nhập tình huống"; -$lang->testcase->importFile = "Nhập CSV"; +$lang->testcase->fileImport = "Nhập CSV"; $lang->testcase->importFromLib = "Nhập từ thư viện"; $lang->testcase->showImport = "Hiển thị Nhập khẩu"; $lang->testcase->exportTemplet = "Xuất Mẫu"; diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php index 65b2630e7d..8c9f5b9580 100644 --- a/module/testcase/lang/zh-cn.php +++ b/module/testcase/lang/zh-cn.php @@ -105,7 +105,7 @@ $lang->testcase->browse = "用例列表"; $lang->testcase->groupCase = "分组浏览用例"; $lang->testcase->import = "导入"; $lang->testcase->importAction = "导入用例"; -$lang->testcase->importFile = "导入CSV"; +$lang->testcase->fileImport = "导入CSV"; $lang->testcase->importFromLib = "从用例库中导入"; $lang->testcase->showImport = "显示导入内容"; $lang->testcase->exportTemplet = "导出模板"; diff --git a/module/testcase/lang/zh-tw.php b/module/testcase/lang/zh-tw.php index aac92bd582..74398cf890 100644 --- a/module/testcase/lang/zh-tw.php +++ b/module/testcase/lang/zh-tw.php @@ -105,7 +105,7 @@ $lang->testcase->browse = "用例列表"; $lang->testcase->groupCase = "分組瀏覽用例"; $lang->testcase->import = "導入"; $lang->testcase->importAction = "導入用例"; -$lang->testcase->importFile = "導入CSV"; +$lang->testcase->fileImport = "導入CSV"; $lang->testcase->importFromLib = "從用例庫中導入"; $lang->testcase->showImport = "顯示導入內容"; $lang->testcase->exportTemplet = "導出模板"; diff --git a/module/testcase/model.php b/module/testcase/model.php index 0c753eefff..8709a49fb3 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -81,7 +81,7 @@ class testcaseModel extends model if($importPriv) { $link = helper::createLink('testcase', 'import', "productID=$productID&branch=$branch"); - $pageActions .= '
  • ' . html::a($link, $this->lang->testcase->importFile, '', "class='export'") . '
  • '; + $pageActions .= '
  • ' . html::a($link, $this->lang->testcase->fileImport, '', "class='export'") . '
  • '; } if($importFromLibPriv) { @@ -1237,8 +1237,8 @@ class testcaseModel extends model if($this->post->isEndPage) { - unlink($this->session->importFile); - unset($_SESSION['importFile']); + unlink($this->session->fileImport); + unset($_SESSION['fileImport']); } } diff --git a/module/testcase/view/caseheader.html.php b/module/testcase/view/caseheader.html.php index 647cdd2f01..2974945093 100644 --- a/module/testcase/view/caseheader.html.php +++ b/module/testcase/view/caseheader.html.php @@ -109,7 +109,7 @@ $class = common::hasPriv('testcase', 'import') ? '' : "class=disabled"; $misc = common::hasPriv('testcase', 'import') ? "class='export'" : "class=disabled"; $link = common::hasPriv('testcase', 'import') ? $this->createLink('testcase', 'import', "productID=$productID&branch=$branch") : '#'; - echo "
  • " . html::a($link, $lang->testcase->importFile, '', $misc) . "
  • "; + echo "
  • " . html::a($link, $lang->testcase->fileImport, '', $misc) . "
  • "; $class = common::hasPriv('testcase', 'importFromLib') ? '' : "class=disabled"; $misc = common::hasPriv('testcase', 'importFromLib') ? '' : "class=disabled"; diff --git a/module/testcase/view/import.html.php b/module/testcase/view/import.html.php index 52b164d3e0..5068e0fe80 100644 --- a/module/testcase/view/import.html.php +++ b/module/testcase/view/import.html.php @@ -3,7 +3,7 @@
    -

    testcase->importFile;?>

    +

    testcase->fileImport;?>