Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* change importFile to fileImport.

Browse Source
This commit is contained in:
wangyidong
2020-05-13 17:39:17 +08:00
parent be2033a859
commit e1dd1b8d1f
14 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/caselib/control.php
+4 -4
View File
@@ -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")));
}
module/caselib/model.php
+3 -3
View File
@@ -91,7 +91,7 @@ class caselibModel extends model
if(common::hasPriv('caselib', 'import'))
{
$link = helper::createLink('caselib', 'import', "libID=$libID");
$pageActions .= html::a($link, "<i class='icon muted icon-import'> </i>" . $this->lang->testcase->importFile, '', "class='btn btn-link export'");
$pageActions .= html::a($link, "<i class='icon muted icon-import'> </i>" . $this->lang->testcase->fileImport, '', "class='btn btn-link export'");
}
$pageActions .= '</div>';
$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']);
}
}
module/caselib/view/browse.html.php
+1 -1
View File
@@ -54,7 +54,7 @@ js::set('flow', $config->global->flow);
<div class='btn-toolbar pull-right'>
<div class='btn-group'>
<?php common::printLink('caselib', 'exportTemplet', "libID=$libID", "<i class='icon icon-export muted'> </i>" . $lang->caselib->exportTemplet, '', "class='btn btn-link export' data-width='35%'");?>
<?php common::printLink('caselib', 'import', "libID=$libID", "<i class='icon muted icon-import'> </i>" . $lang->testcase->importFile, '', "class='btn btn-link export'");?>
<?php common::printLink('caselib', 'import', "libID=$libID", "<i class='icon muted icon-import'> </i>" . $lang->testcase->fileImport, '', "class='btn btn-link export'");?>
</div>
<?php $params = "libID=$libID&moduleID=" . (isset($moduleID) ? $moduleID : 0);?>
<?php common::printLink('caselib', 'batchCreateCase', $params, "<i class='icon-plus'></i>" . $lang->testcase->batchCreate, '', "class='btn btn-secondary'");?>
module/caselib/view/import.html.php
+1 -1
View File
@@ -3,7 +3,7 @@
<div class="container">
<div id="mainContent" class='main-content'>
<div class='main-header'>
<h2><?php echo $lang->testcase->importFile;?></h2>
<h2><?php echo $lang->testcase->fileImport;?></h2>
</div>
<form method='post' enctype='multipart/form-data' target='hiddenwin' style="padding:30px">
<table class='table table-form'>
module/testcase/control.php
+2 -2
View File
@@ -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));
module/testcase/lang/de.php
+1 -1
View File
@@ -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";
module/testcase/lang/en.php
+1 -1
View File
@@ -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";
module/testcase/lang/fr.php
+1 -1
View File
@@ -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";
module/testcase/lang/vi.php
+1 -1
View File
@@ -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";
module/testcase/lang/zh-cn.php
+1 -1
View File
@@ -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 = "导出模板";
module/testcase/lang/zh-tw.php
+1 -1
View File
@@ -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 = "導出模板";
module/testcase/model.php
+3 -3
View File
@@ -81,7 +81,7 @@ class testcaseModel extends model
if($importPriv)
{
$link = helper::createLink('testcase', 'import', "productID=$productID&branch=$branch");
$pageActions .= '<li>' . html::a($link, $this->lang->testcase->importFile, '', "class='export'") . '</li>';
$pageActions .= '<li>' . html::a($link, $this->lang->testcase->fileImport, '', "class='export'") . '</li>';
}
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']);
}
}
module/testcase/view/caseheader.html.php
+1 -1
View File
@@ -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 "<li $class>" . html::a($link, $lang->testcase->importFile, '', $misc) . "</li>";
echo "<li $class>" . html::a($link, $lang->testcase->fileImport, '', $misc) . "</li>";
$class = common::hasPriv('testcase', 'importFromLib') ? '' : "class=disabled";
$misc = common::hasPriv('testcase', 'importFromLib') ? '' : "class=disabled";
module/testcase/view/import.html.php
+1 -1
View File
@@ -3,7 +3,7 @@
<div class="container">
<div id="mainContent" class='main-content'>
<div class='main-header'>
<h2><?php echo $lang->testcase->importFile;?></h2>
<h2><?php echo $lang->testcase->fileImport;?></h2>
</div>
<form method='post' enctype='multipart/form-data' target='hiddenwin' style="padding: 20px 0 15px">
<table class='table table-form w-p100'>