From 5ee43ad1f8903c0186351c6e55ab3450772aeecd Mon Sep 17 00:00:00 2001 From: tanghucheng Date: Mon, 1 Aug 2022 16:03:38 +0800 Subject: [PATCH] * rename exporttemplet to exporttemplate. --- module/bug/config.php | 156 ++++------- module/caselib/control.php | 2 +- module/caselib/lang/de.php | 2 +- module/caselib/lang/en.php | 2 +- module/caselib/lang/fr.php | 2 +- module/caselib/lang/vi.php | 2 +- module/caselib/lang/zh-cn.php | 2 +- module/caselib/lang/zh-tw.php | 2 +- module/caselib/view/browse.html.php | 2 +- ...mplet.html.php => exporttemplate.html.php} | 2 +- module/caselib/view/showimport.html.php | 250 ++++++++++++------ module/group/lang/changelog.php | 4 +- module/group/lang/resource.php | 6 +- module/port/control.php | 87 +++--- module/port/model.php | 51 +++- module/port/view/showimport.html.php | 35 ++- module/project/config.php | 6 +- module/testcase/config.php | 38 ++- module/testcase/control.php | 2 +- module/testcase/lang/de.php | 2 +- module/testcase/lang/en.php | 2 +- module/testcase/lang/fr.php | 2 +- module/testcase/lang/vi.php | 2 +- module/testcase/lang/zh-cn.php | 2 +- module/testcase/lang/zh-tw.php | 2 +- module/testcase/view/caseheader.html.php | 8 +- module/testcase/view/exporttemplet.html.php | 2 +- module/testcase/view/showimport.html.php | 15 +- module/upgrade/model.php | 4 +- 29 files changed, 404 insertions(+), 290 deletions(-) rename module/caselib/view/{exporttemplet.html.php => exporttemplate.html.php} (95%) diff --git a/module/bug/config.php b/module/bug/config.php index 3746a33905..9538222575 100644 --- a/module/bug/config.php +++ b/module/bug/config.php @@ -38,89 +38,6 @@ $config->bug->exportFields = 'id, product, branch, module, project, execution, s lastEditedBy, lastEditedDate, files ,feedbackBy, notifyEmail'; -$config->bug->fieldList['id']['title'] = 'id'; - -$config->bug->fieldList['product']['title'] = 'product'; -$config->bug->fieldList['product']['control'] = 'hidden'; -$config->bug->fieldList['product']['dataSource'] = array('module' => 'product', 'method' => 'getPairs'); - -$config->bug->fieldList['branch']['title'] = 'branch'; -$config->bug->fieldList['branch']['control'] = 'select'; -$config->bug->fieldList['branch']['dataSource'] = array('module' => 'bug', 'method' => 'getRelatedObjects', 'params' => 'branch&id,name'); - -$config->bug->fieldList['module']['control'] = 'select'; -$config->bug->fieldList['module']['title'] = 'module'; -$config->bug->fieldList['module']['dataSource'] = array('module' => 'tree', 'method' => 'getOptionMenu', 'params' => '$productID&bug'); - -$config->bug->fieldList['project']['title'] = 'project'; -$config->bug->fieldList['project']['control'] = 'hidden'; -$config->bug->fieldList['project']['dataSource'] = array('module' => 'product', 'method' => 'getProjectPairsByProduct', 'params' => '$productID'); - -$config->bug->fieldList['execution']['title'] = 'execution'; -$config->bug->fieldList['execution']['dataSource'] = array('module' => 'product', 'method' =>'getAllExecutionPairsByProduct', 'params' => '$productID&$branch'); - -$config->bug->fieldList['story']['title'] = 'story'; -$config->bug->fieldList['story']['control'] = 'select'; -$config->bug->fieldList['story']['dataSource'] = array('module' => 'bug', 'method' =>'getRelatedObjects', 'params' => 'story&id,title'); - -$config->bug->fieldList['task']['title'] = 'task'; -$config->bug->fieldList['task']['dataSource'] = array('module' => 'bug', 'method' =>'getRelatedObjects', 'params' => 'task&id,name'); - -$config->bug->fieldList['steps']['title'] = 'steps'; -$config->bug->fieldList['steps']['control'] = 'textarea'; - -$config->bug->fieldList['status']['title'] = 'status'; - -$config->bug->fieldList['deadline']['title'] = 'deadline'; -$config->bug->fieldList['deadline']['control'] = 'date'; - -$config->bug->fieldList['activatedCount']['title'] = 'activatedCount'; - -$config->bug->fieldList['confirmed']['title'] = 'confirmed'; - -$config->bug->fieldList['mailto']['title'] = 'mailto'; - -$config->bug->fieldList['openedBy']['title'] = 'openedBy'; - -$config->bug->fieldList['openedDate']['title'] = 'openedDate'; - -$config->bug->fieldList['openedBuild']['title'] = 'openedBuild'; -$config->bug->fieldList['openedBuild']['control'] = 'multiple'; -$config->bug->fieldList['openedBuild']['dataSource'] = array('module' => 'bug', 'method' =>'getRelatedObjects', 'params' => 'openedBuild&id,name'); - -$config->bug->fieldList['assignedTo']['title'] = 'assignedTo'; - -$config->bug->fieldList['assignedDate']['title'] = 'assignedDate'; - -$config->bug->fieldList['resolvedBy']['title'] = 'resolvedBy'; - -$config->bug->fieldList['resolution']['title'] = 'resolution'; - -$config->bug->fieldList['resolvedBuild']['title'] = 'resolvedBuild'; - -$config->bug->fieldList['resolvedDate']['title'] = 'resolvedDate'; - -$config->bug->fieldList['closedBy']['title'] = 'closedBy'; - -$config->bug->fieldList['closedDate']['title'] = 'closedDate'; - -$config->bug->fieldList['duplicateBug']['title'] = 'duplicateBug'; - -$config->bug->fieldList['linkBug']['title'] = 'linkBug'; - -$config->bug->fieldList['case']['title'] = 'case'; -$config->bug->fieldList['case']['dataSource'] = array('module' => 'bug', 'method' =>'getRelatedObjects', 'params' => 'case&id,title'); - -$config->bug->fieldList['lastEditedBy']['title'] = 'lastEditedBy'; - -$config->bug->fieldList['lastEditedDate']['title'] = 'lastEditedDate'; - -$config->bug->fieldList['files']['title'] = 'files'; - -$config->bug->fieldList['feedbackBy']['title'] = 'feedbackBy'; - -$config->bug->fieldList['notifyEmail']['title'] = 'notifyEmail'; - if($config->systemMode == 'classic') $config->bug->exportFields = str_replace(' project,', '', $config->bug->exportFields); $config->bug->list->customCreateFields = 'execution,noticefeedbackBy,story,task,pri,severity,os,browser,deadline,mailto,keywords'; @@ -254,6 +171,14 @@ $config->bug->datatable->fieldList['id']['fixed'] = 'left'; $config->bug->datatable->fieldList['id']['width'] = '70'; $config->bug->datatable->fieldList['id']['required'] = 'yes'; +$config->bug->datatable->fieldList['product']['title'] = 'product'; +$config->bug->datatable->fieldList['product']['control'] = 'hidden'; +$config->bug->datatable->fieldList['product']['dataSource'] = array('module' => 'product', 'method' => 'getPairs'); + +$config->bug->datatable->fieldList['module']['control'] = 'select'; +$config->bug->datatable->fieldList['module']['title'] = 'module'; +$config->bug->datatable->fieldList['module']['dataSource'] = array('module' => 'tree', 'method' => 'getOptionMenu', 'params' => '$productID&bug'); + $config->bug->datatable->fieldList['severity']['title'] = 'severityAB'; $config->bug->datatable->fieldList['severity']['fixed'] = 'left'; $config->bug->datatable->fieldList['severity']['width'] = '50'; @@ -277,10 +202,12 @@ $config->bug->datatable->fieldList['title']['width'] = 'auto'; $config->bug->datatable->fieldList['title']['required'] = 'yes'; $config->bug->datatable->fieldList['title']['minWidth'] = '200'; -$config->bug->datatable->fieldList['branch']['title'] = 'branch'; -$config->bug->datatable->fieldList['branch']['fixed'] = 'left'; -$config->bug->datatable->fieldList['branch']['width'] = '100'; -$config->bug->datatable->fieldList['branch']['required'] = 'no'; +$config->bug->datatable->fieldList['branch']['title'] = 'branch'; +$config->bug->datatable->fieldList['branch']['fixed'] = 'left'; +$config->bug->datatable->fieldList['branch']['width'] = '100'; +$config->bug->datatable->fieldList['branch']['required'] = 'no'; +$config->bug->datatable->fieldList['branch']['control'] = 'select'; +$config->bug->datatable->fieldList['branch']['dataSource'] = array('module' => 'bug', 'method' => 'getRelatedObjects', 'params' => 'branch&id,name'); $config->bug->datatable->fieldList['type']['title'] = 'type'; $config->bug->datatable->fieldList['type']['fixed'] = 'no'; @@ -289,16 +216,19 @@ $config->bug->datatable->fieldList['type']['required'] = 'no'; if($config->systemMode == 'new') { - $config->bug->datatable->fieldList['project']['title'] = 'project'; - $config->bug->datatable->fieldList['project']['fixed'] = 'no'; - $config->bug->datatable->fieldList['project']['width'] = '120'; - $config->bug->datatable->fieldList['project']['required'] = 'no'; + $config->bug->datatable->fieldList['project']['title'] = 'project'; + $config->bug->datatable->fieldList['project']['fixed'] = 'no'; + $config->bug->datatable->fieldList['project']['width'] = '120'; + $config->bug->datatable->fieldList['project']['required'] = 'no'; + $config->bug->datatable->fieldList['project']['control'] = 'hidden'; + $config->bug->datatable->fieldList['project']['dataSource'] = array('module' => 'product', 'method' => 'getProjectPairsByProduct', 'params' => '$productID'); } -$config->bug->datatable->fieldList['execution']['title'] = 'execution'; -$config->bug->datatable->fieldList['execution']['fixed'] = 'no'; -$config->bug->datatable->fieldList['execution']['width'] = '120'; -$config->bug->datatable->fieldList['execution']['required'] = 'no'; +$config->bug->datatable->fieldList['execution']['title'] = 'execution'; +$config->bug->datatable->fieldList['execution']['fixed'] = 'no'; +$config->bug->datatable->fieldList['execution']['width'] = '120'; +$config->bug->datatable->fieldList['execution']['required'] = 'no'; +$config->bug->datatable->fieldList['execution']['dataSource'] = array('module' => 'product', 'method' =>'getAllExecutionPairsByProduct', 'params' => '$productID&$branch'); $config->bug->datatable->fieldList['plan']['title'] = 'plan'; $config->bug->datatable->fieldList['plan']['fixed'] = 'no'; @@ -320,15 +250,18 @@ $config->bug->datatable->fieldList['activatedDate']['fixed'] = 'no'; $config->bug->datatable->fieldList['activatedDate']['width'] = '90'; $config->bug->datatable->fieldList['activatedDate']['required'] = 'no'; -$config->bug->datatable->fieldList['story']['title'] = 'story'; -$config->bug->datatable->fieldList['story']['fixed'] = 'no'; -$config->bug->datatable->fieldList['story']['width'] = '120'; -$config->bug->datatable->fieldList['story']['required'] = 'no'; +$config->bug->datatable->fieldList['story']['title'] = 'story'; +$config->bug->datatable->fieldList['story']['fixed'] = 'no'; +$config->bug->datatable->fieldList['story']['width'] = '120'; +$config->bug->datatable->fieldList['story']['required'] = 'no'; +$config->bug->datatable->fieldList['story']['control'] = 'select'; +$config->bug->datatable->fieldList['story']['dataSource'] = array('module' => 'bug', 'method' =>'getRelatedObjects', 'params' => 'story&id,title'); -$config->bug->datatable->fieldList['task']['title'] = 'task'; -$config->bug->datatable->fieldList['task']['fixed'] = 'no'; -$config->bug->datatable->fieldList['task']['width'] = '120'; -$config->bug->datatable->fieldList['task']['required'] = 'no'; +$config->bug->datatable->fieldList['task']['title'] = 'task'; +$config->bug->datatable->fieldList['task']['fixed'] = 'no'; +$config->bug->datatable->fieldList['task']['width'] = '120'; +$config->bug->datatable->fieldList['task']['required'] = 'no'; +$config->bug->datatable->fieldList['task']['dataSource'] = array('module' => 'bug', 'method' =>'getRelatedObjects', 'params' => 'task&id,name'); $config->bug->datatable->fieldList['toTask']['title'] = 'toTask'; $config->bug->datatable->fieldList['toTask']['fixed'] = 'no'; @@ -365,10 +298,12 @@ $config->bug->datatable->fieldList['openedDate']['fixed'] = 'no'; $config->bug->datatable->fieldList['openedDate']['width'] = '90'; $config->bug->datatable->fieldList['openedDate']['required'] = 'no'; -$config->bug->datatable->fieldList['openedBuild']['title'] = 'openedBuild'; -$config->bug->datatable->fieldList['openedBuild']['fixed'] = 'no'; -$config->bug->datatable->fieldList['openedBuild']['width'] = '120'; -$config->bug->datatable->fieldList['openedBuild']['required'] = 'no'; +$config->bug->datatable->fieldList['openedBuild']['title'] = 'openedBuild'; +$config->bug->datatable->fieldList['openedBuild']['fixed'] = 'no'; +$config->bug->datatable->fieldList['openedBuild']['width'] = '120'; +$config->bug->datatable->fieldList['openedBuild']['required'] = 'no'; +$config->bug->datatable->fieldList['openedBuild']['control'] = 'multiple'; +$config->bug->datatable->fieldList['openedBuild']['dataSource'] = array('module' => 'bug', 'method' =>'getRelatedObjects', 'params' => 'openedBuild&id,name'); $config->bug->datatable->fieldList['assignedTo']['title'] = 'assignedToAB'; $config->bug->datatable->fieldList['assignedTo']['fixed'] = 'no'; @@ -384,6 +319,7 @@ $config->bug->datatable->fieldList['deadline']['title'] = 'deadline'; $config->bug->datatable->fieldList['deadline']['fixed'] = 'no'; $config->bug->datatable->fieldList['deadline']['width'] = '90'; $config->bug->datatable->fieldList['deadline']['required'] = 'no'; +$config->bug->datatable->fieldList['deadline']['control'] = 'date'; $config->bug->datatable->fieldList['resolvedBy']['title'] = 'resolvedByAB'; $config->bug->datatable->fieldList['resolvedBy']['fixed'] = 'no'; @@ -430,6 +366,12 @@ $config->bug->datatable->fieldList['actions']['fixed'] = 'right'; $config->bug->datatable->fieldList['actions']['width'] = '150'; $config->bug->datatable->fieldList['actions']['required'] = 'yes'; +$config->bug->datatable->fieldList['steps']['title'] = 'steps'; +$config->bug->datatable->fieldList['steps']['control'] = 'textarea'; + +$config->bug->datatable->fieldList['case']['title'] = 'case'; +$config->bug->datatable->fieldList['case']['dataSource'] = array('module' => 'bug', 'method' =>'getRelatedObjects', 'params' => 'case&id,title'); + $config->bug->colorList = new stdclass(); $config->bug->colorList->pri[0] = '#c0c0c0'; $config->bug->colorList->pri[1] = '#d50000'; diff --git a/module/caselib/control.php b/module/caselib/control.php index 0b74d70736..4d7ce3add2 100644 --- a/module/caselib/control.php +++ b/module/caselib/control.php @@ -442,7 +442,7 @@ class caselib extends control * @access public * @return void */ - public function exportTemplet($libID) + public function exportTemplate($libID) { $this->loadModel('testcase'); if($_POST) diff --git a/module/caselib/lang/de.php b/module/caselib/lang/de.php index 652875e151..bbe008e95b 100644 --- a/module/caselib/lang/de.php +++ b/module/caselib/lang/de.php @@ -21,7 +21,7 @@ $lang->caselib->createCase = 'Create Case'; $lang->caselib->delete = "Delete Suite"; $lang->caselib->linkVersion = "Version"; $lang->caselib->deleted = 'Deleted'; -$lang->caselib->exportTemplet = 'Export Template'; +$lang->caselib->exportTemplate = 'Export Template'; $lang->caselib->batchCreateCase = 'Batch Create'; $lang->caselib->import = 'Import'; $lang->caselib->showImport = 'Imported Data'; diff --git a/module/caselib/lang/en.php b/module/caselib/lang/en.php index 652875e151..bbe008e95b 100644 --- a/module/caselib/lang/en.php +++ b/module/caselib/lang/en.php @@ -21,7 +21,7 @@ $lang->caselib->createCase = 'Create Case'; $lang->caselib->delete = "Delete Suite"; $lang->caselib->linkVersion = "Version"; $lang->caselib->deleted = 'Deleted'; -$lang->caselib->exportTemplet = 'Export Template'; +$lang->caselib->exportTemplate = 'Export Template'; $lang->caselib->batchCreateCase = 'Batch Create'; $lang->caselib->import = 'Import'; $lang->caselib->showImport = 'Imported Data'; diff --git a/module/caselib/lang/fr.php b/module/caselib/lang/fr.php index 9f02e7f2e9..6e1ce27d8d 100644 --- a/module/caselib/lang/fr.php +++ b/module/caselib/lang/fr.php @@ -21,7 +21,7 @@ $lang->caselib->createCase = 'Créer CasTest'; $lang->caselib->delete = "Supprimer Suite"; $lang->caselib->linkVersion = "Version"; $lang->caselib->deleted = 'Supprimé'; -$lang->caselib->exportTemplet = 'Exporter Modèle'; +$lang->caselib->exportTemplate = 'Exporter Modèle'; $lang->caselib->batchCreateCase = 'Créer par lot'; $lang->caselib->import = 'Importer'; $lang->caselib->showImport = 'Données Importées'; diff --git a/module/caselib/lang/vi.php b/module/caselib/lang/vi.php index 48202a34e2..37190c1d37 100644 --- a/module/caselib/lang/vi.php +++ b/module/caselib/lang/vi.php @@ -21,7 +21,7 @@ $lang->caselib->createCase = 'Tạo tình huống'; $lang->caselib->delete = "Xóa Suite"; $lang->caselib->linkVersion = "Phiên bản"; $lang->caselib->deleted = 'Đã xóa'; -$lang->caselib->exportTemplet = 'Xuất mẫu'; +$lang->caselib->exportTemplate = 'Xuất mẫu'; $lang->caselib->batchCreateCase = 'Tạo hàng loạt'; $lang->caselib->import = 'Nhập'; $lang->caselib->importAction = 'Nhập tình huống'; diff --git a/module/caselib/lang/zh-cn.php b/module/caselib/lang/zh-cn.php index e54c946d4e..85a2dfed93 100644 --- a/module/caselib/lang/zh-cn.php +++ b/module/caselib/lang/zh-cn.php @@ -21,7 +21,7 @@ $lang->caselib->createCase = '创建用例'; $lang->caselib->delete = "删除"; $lang->caselib->linkVersion = "版本"; $lang->caselib->deleted = '已删除'; -$lang->caselib->exportTemplet = '导出模板'; +$lang->caselib->exportTemplate = '导出模板'; $lang->caselib->batchCreateCase = '批量创建用例'; $lang->caselib->import = '导入'; $lang->caselib->showImport = '显示导入数据'; diff --git a/module/caselib/lang/zh-tw.php b/module/caselib/lang/zh-tw.php index e0043a96a7..7b0c73a0a8 100644 --- a/module/caselib/lang/zh-tw.php +++ b/module/caselib/lang/zh-tw.php @@ -21,7 +21,7 @@ $lang->caselib->createCase = '創建用例'; $lang->caselib->delete = "刪除"; $lang->caselib->linkVersion = "版本"; $lang->caselib->deleted = '已刪除'; -$lang->caselib->exportTemplet = '導出模板'; +$lang->caselib->exportTemplate = '導出模板'; $lang->caselib->batchCreateCase = '批量創建用例'; $lang->caselib->import = '導入'; $lang->caselib->showImport = '顯示導入數據'; diff --git a/module/caselib/view/browse.html.php b/module/caselib/view/browse.html.php index 20a7880ebc..db1244520f 100644 --- a/module/caselib/view/browse.html.php +++ b/module/caselib/view/browse.html.php @@ -57,7 +57,7 @@ js::set('flow', $config->global->flow); } ?>
- " . $lang->caselib->exportTemplet, '', "class='btn btn-link export' data-width='40%'");?> + " . $lang->caselib->exportTemplate, '', "class='btn btn-link export' data-width='40%'");?> " . $lang->testcase->fileImport, '', "class='btn btn-link export'");?>
createLink('caselib', 'create'), " " . $lang->caselib->create, '', 'class="btn btn-secondary"');?> diff --git a/module/caselib/view/exporttemplet.html.php b/module/caselib/view/exporttemplate.html.php similarity index 95% rename from module/caselib/view/exporttemplet.html.php rename to module/caselib/view/exporttemplate.html.php index 40ad296270..370c4495c9 100644 --- a/module/caselib/view/exporttemplet.html.php +++ b/module/caselib/view/exporttemplate.html.php @@ -23,7 +23,7 @@ function closeWindow()
-

testcase->exportTemplet;?>

+

testcase->exportTemplate;?>

diff --git a/module/caselib/view/showimport.html.php b/module/caselib/view/showimport.html.php index 61561bae22..8482d38757 100644 --- a/module/caselib/view/showimport.html.php +++ b/module/caselib/view/showimport.html.php @@ -1,10 +1,31 @@ - - +getModuleRoot() . 'common/view/header.html.php';?> +requiredFields; + $allCount = $datas->allCount; + $allPager = $datas->allPager; + $pagerID = $datas->pagerID; + $isEndPage = $datas->isEndPage; + $maxImport = $datas->maxImport; + $dataInsert = $datas->dataInsert; + $fields = $datas->fields; + $suhosinInfo = $datas->suhosinInfo; + $model = $datas->model; + $datas = $datas->datas; +?> + +
$this->config->file->maxImport):?>
-

caselib->import;?>

+

task->import;?>

file->importSummary, $allCount, html::input('maxImport', $config->file->maxImport, "style='width:50px'"), ceil($allCount / $config->file->maxImport));?>

import, "id='import'", 'btn btn-primary');?>

@@ -16,125 +37,194 @@ $(function() { if(parseInt($('#maxImport').val())) $('#times').html(Math.ceil(parseInt($('#allCount').html()) / parseInt($('#maxImport').val()))); }); - $('#import').click(function(){location.href = createLink('caselib', 'showImport', "libID=&pageID=1&maxImport=" + $('#maxImport').val())}) + + $('#import').click(function(){location.href = createLink('testcase', 'showImport', "productID=&branch=&pageID=1&maxImport=" + $('#maxImport').val())}) });
-

caselib->import;?>

+

task->import;?>

- +
- - - - - - - - - + + $value):?> + + + + + + + + + + + show) continue; + + $width = ($field->width && $field->width != 'auto' ? $field->width . 'px' : 'auto'); + $required = strpos(",$field->rules,", ",$notEmptyRule->id,") !== false ? 'required' : ''; + echo ""; + } + } + ?> - - $case):?> - title)) continue;?> - id) and !isset($cases[$case->id])) $case->id = 0;?> - - - - - - - - - - - - - - - - + + $value):?> + + + + + + + + + + config->port->dateMatch;?> + $field)) $object->$field = ''; ?> + + + + + + + $field)?> + + + + + + + + + + + + + + loadModel('flow'); + foreach($appendFields as $field) + { + if(!$field->show) continue; + $value = $field->defaultValue ? $field->defaultValue : zget($task, $field->field, ''); + echo ''; + } + } + ?> + + + + + +
testcase->id?> testcase->title?> testcase->module?> testcase->pri?> testcase->type?> testcase->stage?> testcase->keywords?>testcase->precondition?> + task->id?> - - + +
testcase->stepDesc?>testcase->stepExpect?>
$field->name
- id)) - { - echo $case->id . html::hidden("id[$key]", $case->id); - $insert = false; - } - else - { - echo $key . " {$lang->testcase->new}"; - } - echo html::hidden("lib[$key]", $libID); - ?> - title, "class='form-control' style='margin-top:2px'")?>module) ? $case->module : (!empty($case->id) ? $cases[$case->id]->module : ''), "class='form-control chosen'")?>testcase->priList, isset($case->pri) ? $case->pri : (!empty($case->id) ? $cases[$case->id]->pri : ''), "class='form-control chosen'")?>testcase->typeList, isset($case->type) ? $case->type : (!empty($case->id) ? $cases[$case->id]->type : ''), "class='form-control chosen'")?>testcase->stageList, !empty($case->stage) ? $case->stage : (!empty($case->id) ? $cases[$case->id]->stage : ''), "multiple='multiple' class='form-control chosen'")?>keywords) ? $case->keywords : "", "class='form-control'")?>precondition) ? htmlSpecialString($case->precondition) : "", "class='form-control'")?> - - - $desc):?> - - - - - - - -
- -
+ + $object):?> +
lang->save : $this->lang->file->saveAndNext; - if(!$insert and $dataInsert === '') + if(!empty($object->id)) { - echo ""; + echo $object->id . html::hidden("id[$key]", $object->id); + $insert = false; } else { - echo html::submitButton($submitText); - if($dataInsert !== '') echo html::hidden('insert', $dataInsert); + $sub = (strpos($object->title, '>') === 0) ? " {$lang->port->children}" : " {$lang->task->new}"; + echo $addID++ . $sub; + } + echo html::hidden("lib[$key]", $libID); + ?> + $field) ? $object->$field : '', "class='form-control chosen'")?>$field) ? $object->$field : '', "multiple class='form-control chosen'")?>$field) ? $object->$field : '', "class='form-control form-date autocomplete='off'")?>$field) ? $object->$field : '', "class='form-control form-datetime autocomplete='off'")?>$field, "class='form-control' cols='50' rows='1'")?> + + + + $desc):?> + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + 		$field) ? $object->$field : '', "class='form-control autocomplete='off'")?>' . $this->flow->buildControl($field, $value, "$field->field[$key]", true) . '
+ lang->save : $this->lang->file->saveAndNext; + $isStartPage = $pagerID == 1 ? true : false; + if(!$insert and $dataInsert === '') + { + echo ""; + } + else + { + echo html::submitButton($submitText); + if($dataInsert !== '') echo html::hidden('insert', $dataInsert); } echo html::hidden('isEndPage', $isEndPage ? 1 : 0); echo html::hidden('pagerID', $pagerID); - echo '   ' . html::a($this->createLink('caselib', 'browse', "libID=$libID"), $lang->goback, '', 'class="btn btn-wide"'); + echo '   ' . html::a("javascript:history.back(-1)", $lang->goback, '', "class='btn btn-back btn-wide'"); echo '   ' . sprintf($lang->file->importPager, $allCount, $pagerID, $allPager); ?>
- + getModuleRoot() . 'common/view/noticeimport.html.php';?>
- - - - +getModuleRoot() . 'common/view/footer.html.php';?> diff --git a/module/group/lang/changelog.php b/module/group/lang/changelog.php index 1578651e93..17c8eb6b6b 100644 --- a/module/group/lang/changelog.php +++ b/module/group/lang/changelog.php @@ -137,7 +137,7 @@ $lang->changelog['4.3.beta'][] = 'productplan-linkBug'; $lang->changelog['4.3.beta'][] = 'productplan-unlinkBug'; $lang->changelog['4.3.beta'][] = 'productplan-batchUnlinkBug'; $lang->changelog['4.3.beta'][] = 'bug-batchCreate'; -$lang->changelog['4.3.beta'][] = 'testcase-exportTemplet'; +$lang->changelog['4.3.beta'][] = 'testcase-exportTemplate'; $lang->changelog['4.3.beta'][] = 'testcase-import'; $lang->changelog['4.3.beta'][] = 'testcase-showImport'; $lang->changelog['4.3.beta'][] = 'testcase-confirmChange'; @@ -289,7 +289,7 @@ $lang->changelog['9.2'][] = 'custom-working'; $lang->changelog['9.2'][] = 'doc-sort'; $lang->changelog['9.2'][] = 'product-build'; $lang->changelog['9.2'][] = 'testsuite-batchCreateCase'; -$lang->changelog['9.2'][] = 'testsuite-exportTemplet'; +$lang->changelog['9.2'][] = 'testsuite-exportTemplate'; $lang->changelog['9.2'][] = 'testsuite-import'; $lang->changelog['9.2'][] = 'testsuite-showImport'; $lang->changelog['9.5'][] = 'bug-batchActivate'; diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index c535452c03..367fe0fcee 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -976,7 +976,7 @@ $lang->resource->testcase->batchEdit = 'batchEdit'; $lang->resource->testcase->delete = 'deleteAction'; $lang->resource->testcase->batchDelete = 'batchDelete'; $lang->resource->testcase->export = 'exportAction'; -$lang->resource->testcase->exportTemplet = 'exportTemplet'; +$lang->resource->testcase->exportTemplate = 'exportTemplate'; $lang->resource->testcase->import = 'importAction'; $lang->resource->testcase->showImport = 'showImport'; $lang->resource->testcase->confirmChange = 'confirmChange'; @@ -1113,7 +1113,7 @@ $lang->resource->caselib->delete = 'deleteAction'; $lang->resource->caselib->view = 'view'; $lang->resource->caselib->createCase = 'createCase'; $lang->resource->caselib->batchCreateCase = 'batchCreateCase'; -$lang->resource->caselib->exportTemplet = 'exportTemplet'; +$lang->resource->caselib->exportTemplate = 'exportTemplate'; $lang->resource->caselib->import = 'importAction'; $lang->resource->caselib->showImport = 'showImport'; @@ -1125,7 +1125,7 @@ $lang->caselib->methodOrder[20] = 'delete'; $lang->caselib->methodOrder[25] = 'view'; $lang->caselib->methodOrder[30] = 'createCase'; $lang->caselib->methodOrder[35] = 'batchCreateCase'; -$lang->caselib->methodOrder[40] = 'exportTemplet'; +$lang->caselib->methodOrder[40] = 'exportTemplate'; $lang->caselib->methodOrder[45] = 'import'; $lang->caselib->methodOrder[50] = 'showImport'; diff --git a/module/port/control.php b/module/port/control.php index e73dc30282..a470ef45b2 100644 --- a/module/port/control.php +++ b/module/port/control.php @@ -25,22 +25,44 @@ class port extends control * @access public * @return void */ - public function exportTemplate($model, $params) + public function exportTemplate($model, $params = '') { if($_POST) { - /* Split parameters into variables (executionID=1,status=open).*/ - $params = explode(',', $params); - foreach($params as $key => $param) + $this->loadModel($model); + if($this->config->edition != 'open') { - $param = explode('=', $param); - $params[$param[0]] = $param[1]; - unset($params[$key]); + $appendFields = $this->dao->select('t2.*')->from(TABLE_WORKFLOWLAYOUT)->alias('t1') + ->leftJoin(TABLE_WORKFLOWFIELD)->alias('t2')->on('t1.field=t2.field && t1.module=t2.module') + ->where('t1.module')->eq($model) + ->andWhere('t1.action')->eq('exporttemplate') + ->andWhere('t2.buildin')->eq(0) + ->orderBy('t1.order') + ->fetchAll(); + + foreach($appendFields as $appendField) + { + $this->lang->$model->{$appendField->field} = $appendField->name; + $this->config->$model->templateFields .= ',' . $appendField->field; + } } - extract($params); + + if($params) + { + /* Split parameters into variables (executionID=1,status=open).*/ + $params = explode(',', $params); + foreach($params as $key => $param) + { + $param = explode('=', $param); + $params[$param[0]] = $param[1]; + unset($params[$key]); + } + extract($params); + + /* save params to session. */ + $this->session->set(($model.'PortParams'), $params); + } - /* save params to session. */ - $this->session->set(($model.'PortParams'), $params); $this->loadModel($model); $this->config->port->sysDataList = $this->port->initSysDataFields(); @@ -53,11 +75,12 @@ class port extends control if($list) foreach($list as $listName => $listValue) $this->post->set($listName, $listValue); $fields = $this->port->getExportDatas($fieldList); + $this->post->set('fields', $fields['fields']); - $this->post->set('kind', $model); + $this->post->set('kind', isset($_POST['kind']) ? $_POST['kind'] : $model); $this->post->set('rows', array()); - $this->post->set('extraNum', $this->post->num); - $this->post->set('fileName', $model . 'Template'); + $this->post->set('extraNum', $this->post->num); + $this->post->set('fileName', isset($_POST['fileName']) ? $_POST['fileName'] : $model . 'Template'); $this->fetch('file', 'export2' . $this->post->fileType, $_POST); } @@ -106,43 +129,33 @@ class port extends control } /** - * getWorkFlowFields - * - * @access public - * @return void - */ - public function getWorkFlowFields() - { - if($this->config->edition != 'open') - { - $appendFields = $this->loadModel('workflowaction')->getFields('task', 'showimport', false); - - foreach($appendFields as $appendField) $this->config->task->exportFields .= ',' . $appendField->field; - - $this->view->appendFields = $appendFields; - $this->view->notEmptyRule = $this->loadModel('workflowrule')->getByTypeAndRule('system', 'notempty'); - } - } - - /** - * ajaxGetOptions + * Ajax Get Options. * * @param string $model * @param string $field * @param string $value - * @param string $index + * @param string $id * @access public * @return void */ - public function ajaxGetOptions($model = '', $field = '', $value = '', $index = '') + public function ajaxGetOptions($model = '', $field = '', $value = '', $id = '') { $this->loadModel($model); - $fields = $this->config->$model->templateFields; + $fields = $this->config->$model->templateFields; + + if($this->config->edition != 'open') + { + $appendFields = $this->loadModel('workflowaction')->getFields($model, 'showimport', false); + + foreach($appendFields as $appendField) $fields .= ',' . $appendField->field; + } + $fieldList = $this->port->initFieldList($model, $fields, false); + if(empty($fieldList[$field]['values'])) $fieldList[$field]['values'] = array(); if(!isset($fieldList[$field]['values'][''])) $fieldList[$field]['values'][''] = ''; $multiple = $fieldList[$field]['control'] == 'multiple' ? 'multiple' : ''; - return print(html::select($field. "[$index]", $fieldList[$field]['values'], $value, "class='form-control picker-select' $multiple")); + return print(html::select($id, $fieldList[$field]['values'], $value, "class='form-control picker-select' $multiple")); } } diff --git a/module/port/model.php b/module/port/model.php index cfc63dd3cd..46bc901c68 100644 --- a/module/port/model.php +++ b/module/port/model.php @@ -1,7 +1,6 @@ loadModel($model); - $this->modelConfig = $this->config->$model; - $this->modelLang = $this->lang->$model; + $this->modelConfig = $this->config->$model; + $this->modelLang = $this->lang->$model; + $this->modelFieldList = $this->config->$model->datatable->fieldList; + $this->modelListFields = explode(',', $this->config->$model->listFields); } } @@ -183,17 +192,18 @@ class portModel extends model $this->commonActions($model); $this->mergeConfig($model); - $this->config->port->sysDataList = $this->initSysDataFields(); + $this->portConfig->sysDataList = $this->initSysDataFields(); $portFieldList = $this->portConfig->fieldList; if(empty($fields)) return false; + $fields = explode(',', $fields); $fieldList = array(); /* build module fieldList. */ foreach ($fields as $key => $field) { $field = trim($field); - $modelFieldList = isset($this->modelConfig->fieldList[$field]) ? $this->modelConfig->fieldList[$field] : array(); + $modelFieldList = isset($this->modelFieldList[$field]) ? $this->modelFieldList[$field] : array(); foreach ($portFieldList as $portField => $value) { @@ -627,10 +637,11 @@ class portModel extends model public function setListValue($model, $fieldList) { $lists = array(); + $this->commonActions($model); - if(!empty($this->config->$model->listFields)) + if(!empty($this->modelListFields)) { - $listFields = $this->config->$model->listFields; + $listFields = $this->modelListFields; foreach($listFields as $field) { $listName = $field . 'List'; @@ -895,9 +906,9 @@ class portModel extends model */ public function getImportFields($model = '') { - $this->app->loadLang($model); + $this->commonActions($model); $modelLang = $this->lang->$model; - $fields = $this->config->$model->templateFields; + $fields = explode(',', $this->modelConfig->templateFields); array_unshift($fields, 'id'); foreach($fields as $key => $fieldName) { @@ -909,6 +920,26 @@ class portModel extends model return $fields; } + /** + * Get WorkFlow fields . + * + * @param int $model + * @access public + * @return void + */ + public function getWorkFlowFields($model) + { + if($this->config->edition != 'open') + { + $appendFields = $this->loadModel('workflowaction')->getFields($model, 'showimport', false); + + foreach($appendFields as $appendField) $this->config->$model->exportFields .= ',' . $appendField->field; + + $this->session->set('appendFields', $appendFields); + $this->session->set('notEmptyRule', $this->loadModel('workflowrule')->getByTypeAndRule('system', 'notempty')); + } + } + /** * Get view datas. * @@ -1189,6 +1220,8 @@ class portModel extends model $importFields = $this->config->$model->templateFields; + $this->getWorkFlowFields($model); + $datas->requiredFields = $this->config->$model->create->requiredFields; $datas->allPager = isset($datas->allPager) ? $datas->allPager : 1; $datas->pagerID = $pagerID; diff --git a/module/port/view/showimport.html.php b/module/port/view/showimport.html.php index 7f1cb9034c..94f5944579 100644 --- a/module/port/view/showimport.html.php +++ b/module/port/view/showimport.html.php @@ -13,9 +13,8 @@ $datas = $datas->datas; ?> @@ -46,6 +45,10 @@ $(function() +session->appendFields; + $notEmptyRule = $this->session->notEmptyRule; +?>

port->import;?>

@@ -60,6 +63,19 @@ $(function() + show) continue; + + $width = ($field->width && $field->width != 'auto' ? $field->width . 'px' : 'auto'); + $required = strpos(",$field->rules,", ",$notEmptyRule->id,") !== false ? 'required' : ''; + echo "$field->name"; + } + } + ?> @@ -67,6 +83,7 @@ $(function() $insert = true; $addID = 1; $colspan = 1; + ?> $object):?> @@ -116,6 +133,18 @@ $(function() + loadModel('flow'); + foreach($appendFields as $field) + { + if(!$field->show) continue; + $value = $field->defaultValue ? $field->defaultValue : zget($object, $field->field, ''); + echo '' . $this->flow->buildControl($field, $value, "$field->field[$key]", true) . ''; + } + } + ?> @@ -159,7 +188,7 @@ $('#showData').on('mouseenter', '.picker', function(e){ var value = myPicker.prev().val(); if($('#' + id).attr('isInit')) return; - $.get(createLink('port', 'ajaxGetOptions', 'model=&field=' + field + '&value=' + value + '&index=' + index), function(data) + $.get(createLink('port', 'ajaxGetOptions', 'model=&field=' + field + '&value=' + value + '&id=' + id), function(data) { $('#' + id).parent().html(data); $('#' + id).picker({chosenMode: true}); diff --git a/module/project/config.php b/module/project/config.php index c90e9b5f05..c46392359f 100644 --- a/module/project/config.php +++ b/module/project/config.php @@ -175,9 +175,9 @@ $config->project->search['params']['closedDate'] = array('operator' => '=' $config->project->includedPriv['project'] = array('edit', 'group', 'createGroup', 'managePriv', 'manageMembers', 'manageGroupMember', 'copyGroup', 'editGroup', 'start', 'suspend', 'close', 'activate', 'delete', 'view', 'whitelist', 'addWhitelist', 'unbindWhitelist', 'manageProducts', 'dynamic', 'build', 'bug', 'testcase', 'testtask', 'testreport', 'execution', 'team', 'unlinkMember'); $config->project->includedPriv['execution'] = array('create', 'start', 'delete', 'calendar', 'effortCalendar', 'effort', 'taskEffort', 'computeTaskEffort', 'deleterelation', 'maintainrelation', 'relation', 'gantt'); $config->project->includedPriv['task'] = array('create'); -$config->project->includedPriv['story'] = array('create', 'batchCreate', 'edit', 'export', 'delete', 'view', 'change', 'review', 'batchReview', 'recall', 'close', 'batchClose', 'batchChangePlan', 'batchChangeStage', 'assignTo', 'batchAssignTo', 'activate', 'zeroCase', 'batchEdit', 'import', 'showImport', 'exportTemplet', 'importToLib', 'batchImportToLib', 'relation', 'browse'); -$config->project->includedPriv['bug'] = array('create', 'confirmBug', 'view', 'edit', 'assignTo', 'batchAssignTo', 'resolve', 'activate', 'close', 'export', 'confirmStoryChange', 'delete', 'linkBugs', 'import', 'showImport', 'exportTemplet'); -$config->project->includedPriv['testcase'] = array('groupCase', 'create', 'batchCreate', 'createBug', 'view', 'edit', 'delete', 'export', 'confirmChange', 'confirmStoryChange', 'batchEdit', 'batchDelete', 'linkCases', 'bugs', 'review', 'batchReview', 'batchConfirmStoryChange', 'importFromLib', 'batchCaseTypeChange', 'exportTemplet', 'import', 'showImport', 'confirmLibcaseChange', 'ignoreLibcaseChange', 'submit'); +$config->project->includedPriv['story'] = array('create', 'batchCreate', 'edit', 'export', 'delete', 'view', 'change', 'review', 'batchReview', 'recall', 'close', 'batchClose', 'batchChangePlan', 'batchChangeStage', 'assignTo', 'batchAssignTo', 'activate', 'zeroCase', 'batchEdit', 'import', 'showImport', 'exportTemplate', 'importToLib', 'batchImportToLib', 'relation', 'browse'); +$config->project->includedPriv['bug'] = array('create', 'confirmBug', 'view', 'edit', 'assignTo', 'batchAssignTo', 'resolve', 'activate', 'close', 'export', 'confirmStoryChange', 'delete', 'linkBugs', 'import', 'showImport', 'exportTemplate'); +$config->project->includedPriv['testcase'] = array('groupCase', 'create', 'batchCreate', 'createBug', 'view', 'edit', 'delete', 'export', 'confirmChange', 'confirmStoryChange', 'batchEdit', 'batchDelete', 'linkCases', 'bugs', 'review', 'batchReview', 'batchConfirmStoryChange', 'importFromLib', 'batchCaseTypeChange', 'exportTemplate', 'import', 'showImport', 'confirmLibcaseChange', 'ignoreLibcaseChange', 'submit'); $config->project->includedPriv['testtask'] = array('create', 'cases', 'groupCase', 'edit', 'delete', 'batchAssign', 'linkcase', 'unlinkcase', 'runcase', 'results', 'batchUnlinkCases', 'report', 'browseUnits', 'unitCases', 'importUnitResult', 'batchRun', 'runDeployCase', 'deployCaseResults'); $config->project->includedPriv['doc'] = array('createLib', 'editLib', 'deleteLib', 'create', 'edit', 'delete', 'deleteFile', 'allLibs', 'objectLibs', 'collect', 'tableContents', 'showFiles', 'diff', 'manageBook', 'importToPracticeLib', 'importToComponentLib'); $config->project->includedPriv['repo'] = array('create', 'showSyncCommit', 'browse', 'view', 'diff', 'log', 'revision', 'blame', 'download', 'apiGetRepoByUrl', 'review', 'addBug', 'editBug', 'deleteBug', 'addComment', 'editComment', 'deleteComment'); diff --git a/module/testcase/config.php b/module/testcase/config.php index a2013331e4..ae74d339c7 100644 --- a/module/testcase/config.php +++ b/module/testcase/config.php @@ -23,24 +23,6 @@ $config->testcase->exportFields = ' pri, type, stage, status, bugsAB, resultsAB, stepNumberAB, lastRunner, lastRunDate, lastRunResult, openedBy, openedDate, lastEditedBy, lastEditedDate, version, linkCase, files'; -$config->testcase->fieldList['product']['title'] = 'product'; -$config->testcase->fieldList['product']['control'] = 'hidden'; -$config->testcase->fieldList['product']['dataSource'] = array('module' => 'port', 'method' => 'getRelatedObjects', 'params' => 'testcase&product&id,name'); - -$config->testcase->fieldList['branch']['title'] = 'branch'; -$config->testcase->fieldList['branch']['dataSource'] = array('module' => 'port', 'method' => 'getRelatedObjects', 'params' => 'testcase&branch&id,name'); - -$config->testcase->fieldList['module']['title'] = 'module'; -$config->testcase->fieldList['module']['control'] = 'select'; -$config->testcase->fieldList['module']['dataSource'] = array('module' => 'tree', 'method' => 'getOptionMenu', 'params' => '$productID&case'); - -$config->testcase->fieldList['story']['title'] = 'product'; -$config->testcase->fieldList['story']['control'] = 'select'; -$config->testcase->fieldList['story']['dataSource'] = array('module' => 'port', 'method' => 'getRelatedObjects', 'params' => 'testcase&story&id,title'); - -$config->testcase->fieldList['stage']['title'] = 'product'; -$config->testcase->fieldList['stage']['control'] = 'multiple'; - $config->testcase->customCreateFields = 'story,stage,pri,keywords'; $config->testcase->customBatchCreateFields = 'module,stage,story,pri,precondition,keywords,review'; $config->testcase->customBatchEditFields = 'module,story,stage,precondition,status,pri,keywords'; @@ -102,6 +84,14 @@ $config->testcase->datatable->fieldList['id']['fixed'] = 'left'; $config->testcase->datatable->fieldList['id']['width'] = '70'; $config->testcase->datatable->fieldList['id']['required'] = 'yes'; +$config->testcase->datatable->fieldList['product']['title'] = 'priAB'; +$config->testcase->datatable->fieldList['product']['control'] = 'hidden'; +$config->testcase->datatable->fieldList['product']['dataSource'] = array('module' => 'port', 'method' => 'getRelatedObjects', 'params' => 'testcase&product&id,name'); + +$config->testcase->datatable->fieldList['module']['title'] = 'module'; +$config->testcase->datatable->fieldList['module']['control'] = 'select'; +$config->testcase->datatable->fieldList['module']['dataSource'] = array('module' => 'tree', 'method' => 'getOptionMenu', 'params' => '$productID&case'); + $config->testcase->datatable->fieldList['pri']['title'] = 'priAB'; $config->testcase->datatable->fieldList['pri']['fixed'] = 'left'; $config->testcase->datatable->fieldList['pri']['width'] = '40'; @@ -113,10 +103,11 @@ $config->testcase->datatable->fieldList['title']['fixed'] = 'left'; $config->testcase->datatable->fieldList['title']['width'] = 'auto'; $config->testcase->datatable->fieldList['title']['required'] = 'yes'; -$config->testcase->datatable->fieldList['branch']['title'] = 'branch'; -$config->testcase->datatable->fieldList['branch']['fixed'] = 'left'; -$config->testcase->datatable->fieldList['branch']['width'] = '100'; -$config->testcase->datatable->fieldList['branch']['required'] = 'no'; +$config->testcase->datatable->fieldList['branch']['title'] = 'branch'; +$config->testcase->datatable->fieldList['branch']['fixed'] = 'left'; +$config->testcase->datatable->fieldList['branch']['width'] = '100'; +$config->testcase->datatable->fieldList['branch']['required'] = 'no'; +$config->testcase->datatable->fieldList['branch']['dataSource'] = array('module' => 'port', 'method' => 'getRelatedObjects', 'params' => 'testcase&branch&id,name'); $config->testcase->datatable->fieldList['type']['title'] = 'type'; $config->testcase->datatable->fieldList['type']['fixed'] = 'no'; @@ -127,6 +118,7 @@ $config->testcase->datatable->fieldList['stage']['title'] = 'stage'; $config->testcase->datatable->fieldList['stage']['fixed'] = 'no'; $config->testcase->datatable->fieldList['stage']['width'] = '110'; $config->testcase->datatable->fieldList['stage']['required'] = 'no'; +$config->testcase->datatable->fieldList['stage']['control'] = 'multiple'; $config->testcase->datatable->fieldList['precondition']['title'] = 'precondition'; $config->testcase->datatable->fieldList['precondition']['fixed'] = 'no'; @@ -210,6 +202,8 @@ $config->testcase->datatable->fieldList['story']['title'] = 'story'; $config->testcase->datatable->fieldList['story']['fixed'] = 'no'; $config->testcase->datatable->fieldList['story']['width'] = '90'; $config->testcase->datatable->fieldList['story']['required'] = 'no'; +$config->testcase->datatable->fieldList['story']['control'] = 'select'; +$config->testcase->datatable->fieldList['story']['dataSource'] = array('module' => 'port', 'method' => 'getRelatedObjects', 'params' => 'testcase&story&id,title'); $config->testcase->datatable->fieldList['bugs']['title'] = 'B'; $config->testcase->datatable->fieldList['bugs']['fixed'] = 'no'; diff --git a/module/testcase/control.php b/module/testcase/control.php index 3af8e4fe59..73a4557b33 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -1731,7 +1731,7 @@ class testcase extends control * @access public * @return void */ - public function exportTemplet($productID) + public function exportTemplate($productID) { if($_POST) { diff --git a/module/testcase/lang/de.php b/module/testcase/lang/de.php index 20888cd3c8..2c77eae829 100644 --- a/module/testcase/lang/de.php +++ b/module/testcase/lang/de.php @@ -130,7 +130,7 @@ $lang->testcase->importAction = "Import Case"; $lang->testcase->fileImport = "Importiere CSV"; $lang->testcase->importFromLib = "Import aus Bibliothek"; $lang->testcase->showImport = "Import Anzeigen"; -$lang->testcase->exportTemplet = "Export Vorlage"; +$lang->testcase->exportTemplate = "Export Vorlage"; $lang->testcase->export = "Exportiere Daten"; $lang->testcase->exportAction = "Export Case"; $lang->testcase->reportChart = 'Bericht Chart'; diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php index 98f7e19313..454d47ee44 100644 --- a/module/testcase/lang/en.php +++ b/module/testcase/lang/en.php @@ -130,7 +130,7 @@ $lang->testcase->importAction = "Import Case"; $lang->testcase->fileImport = "Import CSV"; $lang->testcase->importFromLib = "Import From Library"; $lang->testcase->showImport = "Show Import"; -$lang->testcase->exportTemplet = "Export Template"; +$lang->testcase->exportTemplate = "Export Template"; $lang->testcase->export = "Export Data"; $lang->testcase->exportAction = "Export Case"; $lang->testcase->reportChart = 'Report Chart'; diff --git a/module/testcase/lang/fr.php b/module/testcase/lang/fr.php index 52d72910af..4ed7f890ca 100644 --- a/module/testcase/lang/fr.php +++ b/module/testcase/lang/fr.php @@ -130,7 +130,7 @@ $lang->testcase->importAction = "Importer CasTest"; $lang->testcase->fileImport = "Importer CSV"; $lang->testcase->importFromLib = "Importer de la Library"; $lang->testcase->showImport = "Voir Import"; -$lang->testcase->exportTemplet = "Exporter Modèle"; +$lang->testcase->exportTemplate = "Exporter Modèle"; $lang->testcase->export = "Exporter Données"; $lang->testcase->exportAction = "Exporter CasTest"; $lang->testcase->reportChart = 'Graphique'; diff --git a/module/testcase/lang/vi.php b/module/testcase/lang/vi.php index c94f2630af..4118eff464 100644 --- a/module/testcase/lang/vi.php +++ b/module/testcase/lang/vi.php @@ -110,7 +110,7 @@ $lang->testcase->importAction = "Nhập tình huống"; $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"; +$lang->testcase->exportTemplate = "Xuất Mẫu"; $lang->testcase->export = "Xuất dữ liệu"; $lang->testcase->exportAction = "Xuất tình huống"; $lang->testcase->reportChart = 'Biểu đồ báo cáo'; diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php index 5496e40098..439b8bafdf 100644 --- a/module/testcase/lang/zh-cn.php +++ b/module/testcase/lang/zh-cn.php @@ -130,7 +130,7 @@ $lang->testcase->importAction = "导入用例"; $lang->testcase->fileImport = "导入CSV"; $lang->testcase->importFromLib = "从用例库中导入"; $lang->testcase->showImport = "显示导入内容"; -$lang->testcase->exportTemplet = "导出模板"; +$lang->testcase->exportTemplate = "导出模板"; $lang->testcase->export = "导出数据"; $lang->testcase->exportAction = "导出用例"; $lang->testcase->reportChart = '报表统计'; diff --git a/module/testcase/lang/zh-tw.php b/module/testcase/lang/zh-tw.php index b240bdcd39..50f14a3052 100644 --- a/module/testcase/lang/zh-tw.php +++ b/module/testcase/lang/zh-tw.php @@ -126,7 +126,7 @@ $lang->testcase->importAction = "導入用例"; $lang->testcase->fileImport = "導入CSV"; $lang->testcase->importFromLib = "從用例庫中導入"; $lang->testcase->showImport = "顯示導入內容"; -$lang->testcase->exportTemplet = "導出模板"; +$lang->testcase->exportTemplate = "導出模板"; $lang->testcase->export = "導出數據"; $lang->testcase->exportAction = "導出用例"; $lang->testcase->reportChart = '報表統計'; diff --git a/module/testcase/view/caseheader.html.php b/module/testcase/view/caseheader.html.php index 98f2357687..f7e246bf8e 100644 --- a/module/testcase/view/caseheader.html.php +++ b/module/testcase/view/caseheader.html.php @@ -127,10 +127,10 @@ $link = common::hasPriv('testcase', 'export') ? $this->createLink('testcase', 'export', "productID=$productID&orderBy=$orderBy&taskID=0&browseType=$browseType") : '#'; echo "
  • " . html::a($link, $lang->testcase->export, '', $misc . "data-app={$this->app->tab}") . "
    • "; - $class = common::hasPriv('testcase', 'exportTemplet') ? '' : "class=disabled"; - $misc = common::hasPriv('testcase', 'exportTemplet') ? "class='export'" : "class=disabled"; - $link = common::hasPriv('testcase', 'exportTemplet') ? $this->createLink('testcase', 'exportTemplet', "productID=$productID") : '#'; - echo "
  • " . html::a($link, $lang->testcase->exportTemplet, '', $misc . "data-app={$this->app->tab} data-width='50%'") . "
    • "; + $class = common::hasPriv('testcase', 'exportTemplate') ? '' : "class=disabled"; + $misc = common::hasPriv('testcase', 'exportTemplate') ? "class='export'" : "class=disabled"; + $link = common::hasPriv('testcase', 'exportTemplate') ? $this->createLink('testcase', 'exportTemplate', "productID=$productID") : '#'; + echo "
  • " . html::a($link, $lang->testcase->exportTemplate, '', $misc . "data-app={$this->app->tab} data-width='50%'") . "
    • "; ?>
    diff --git a/module/testcase/view/exporttemplet.html.php b/module/testcase/view/exporttemplet.html.php index 337f3a89d7..e35384c8ab 100644 --- a/module/testcase/view/exporttemplet.html.php +++ b/module/testcase/view/exporttemplet.html.php @@ -21,7 +21,7 @@ function closeWindow()
    -

    testcase->exportTemplet;?>

    +

    testcase->exportTemplate;?>

    diff --git a/module/testcase/view/showimport.html.php b/module/testcase/view/showimport.html.php index d652788b18..dbd1393cb1 100644 --- a/module/testcase/view/showimport.html.php +++ b/module/testcase/view/showimport.html.php @@ -1,4 +1,17 @@ getModuleRoot() . 'common/view/header.html.php';?> +requiredFields; + $allCount = $datas->allCount; + $allPager = $datas->allPager; + $pagerID = $datas->pagerID; + $isEndPage = $datas->isEndPage; + $maxImport = $datas->maxImport; + $dataInsert = $datas->dataInsert; + $fields = $datas->fields; + $suhosinInfo = $datas->suhosinInfo; + $model = $datas->model; + $datas = $datas->datas; +?>