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);