From 2eec12eeacb85b2813f6f5d39634cb6fcfea956c Mon Sep 17 00:00:00 2001 From: tanghucheng Date: Mon, 8 Aug 2022 12:15:28 +0800 Subject: [PATCH] * Format code for port. --- module/bug/model.php | 10 +++----- module/caselib/lang/de.php | 38 ++++++++++++++--------------- module/caselib/lang/en.php | 38 ++++++++++++++--------------- module/caselib/lang/fr.php | 38 ++++++++++++++--------------- module/caselib/lang/zh-cn.php | 38 ++++++++++++++--------------- module/port/lang/zh-cn.php | 1 - module/port/model.php | 5 +--- module/port/view/tfoot.html.php | 42 ++++++++++++++++----------------- 8 files changed, 101 insertions(+), 109 deletions(-) diff --git a/module/bug/model.php b/module/bug/model.php index e9c3f2ac42..80850637da 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -3532,24 +3532,20 @@ class bugModel extends model * Get related objects id lists. * * @param int $object - * @param string $name + * @param string $pairs * @access public * @return void */ public function getRelatedObjects($object, $pairs = '') { /* Get bugs. */ - $bugs = $this->dao->select('*')->from(TABLE_BUG)->where($this->session->bugQueryCondition) - ->fetchAll('id'); + $bugs = $this->dao->select('*')->from(TABLE_BUG)->where($this->session->bugQueryCondition)->fetchAll('id'); /* Get related objects id lists. */ $relatedObjectIdList = array(); $relatedObjects = array(); - foreach($bugs as $bug) - { - $relatedObjectIdList[$bug->$object] = $bug->$object; - } + foreach($bugs as $bug) $relatedObjectIdList[$bug->$object] = $bug->$object; if($object == 'openedBuild') $object = 'build'; diff --git a/module/caselib/lang/de.php b/module/caselib/lang/de.php index ad755d2159..55da26ed6d 100644 --- a/module/caselib/lang/de.php +++ b/module/caselib/lang/de.php @@ -12,25 +12,25 @@ $lang->caselib->common = 'Case Library'; $lang->caselib->all = 'All Case Libraries'; -$lang->caselib->index = "Library Home"; -$lang->caselib->create = "Create Case Library"; -$lang->caselib->edit = 'Edit Case Library'; -$lang->caselib->browse = 'View Cases in Library'; -$lang->caselib->view = 'Library Detail'; -$lang->caselib->createCase = 'Create Case'; -$lang->caselib->delete = "Delete Suite"; -$lang->caselib->linkVersion = "Version"; -$lang->caselib->deleted = 'Deleted'; -$lang->caselib->exportTemplate = 'Export Template'; -$lang->caselib->batchCreateCase = 'Batch Create'; -$lang->caselib->import = 'Import'; -$lang->caselib->showImport = 'Imported Data'; -$lang->caselib->type = 'Type'; -$lang->caselib->product = $lang->productCommon; -$lang->caselib->browseAction = 'Caselib List'; -$lang->caselib->deleteAction = "Delete Caselib"; -$lang->caselib->importAction = 'Import Case'; -$lang->caselib->linkVersion = "Version"; +$lang->caselib->index = "Library Home"; +$lang->caselib->create = "Create Case Library"; +$lang->caselib->edit = 'Edit Case Library'; +$lang->caselib->browse = 'View Cases in Library'; +$lang->caselib->view = 'Library Detail'; +$lang->caselib->createCase = 'Create Case'; +$lang->caselib->delete = "Delete Suite"; +$lang->caselib->linkVersion = "Version"; +$lang->caselib->deleted = 'Deleted'; +$lang->caselib->exportTemplate = 'Export Template'; +$lang->caselib->batchCreateCase = 'Batch Create'; +$lang->caselib->import = 'Import'; +$lang->caselib->showImport = 'Imported Data'; +$lang->caselib->type = 'Type'; +$lang->caselib->product = $lang->productCommon; +$lang->caselib->browseAction = 'Caselib List'; +$lang->caselib->deleteAction = "Delete Caselib"; +$lang->caselib->importAction = 'Import Case'; +$lang->caselib->linkVersion = "Version"; $lang->caselib->id = 'ID'; $lang->caselib->name = 'Name'; diff --git a/module/caselib/lang/en.php b/module/caselib/lang/en.php index e26b452b0c..55da26ed6d 100644 --- a/module/caselib/lang/en.php +++ b/module/caselib/lang/en.php @@ -12,25 +12,25 @@ $lang->caselib->common = 'Case Library'; $lang->caselib->all = 'All Case Libraries'; -$lang->caselib->index = "Library Home"; -$lang->caselib->create = "Create Case Library"; -$lang->caselib->edit = 'Edit Case Library'; -$lang->caselib->browse = 'View Cases in Library'; -$lang->caselib->view = 'Library Detail'; -$lang->caselib->createCase = 'Create Case'; -$lang->caselib->delete = "Delete Suite"; -$lang->caselib->linkVersion = "Version"; -$lang->caselib->deleted = 'Deleted'; -$lang->caselib->exportTemplate = 'Export Template'; -$lang->caselib->batchCreateCase = 'Batch Create'; -$lang->caselib->import = 'Import'; -$lang->caselib->showImport = 'Imported Data'; -$lang->caselib->type = 'Type'; -$lang->caselib->product = $lang->productCommon; -$lang->caselib->browseAction = 'Caselib List'; -$lang->caselib->deleteAction = "Delete Caselib"; -$lang->caselib->importAction = 'Import Case'; -$lang->caselib->linkVersion = "Version"; +$lang->caselib->index = "Library Home"; +$lang->caselib->create = "Create Case Library"; +$lang->caselib->edit = 'Edit Case Library'; +$lang->caselib->browse = 'View Cases in Library'; +$lang->caselib->view = 'Library Detail'; +$lang->caselib->createCase = 'Create Case'; +$lang->caselib->delete = "Delete Suite"; +$lang->caselib->linkVersion = "Version"; +$lang->caselib->deleted = 'Deleted'; +$lang->caselib->exportTemplate = 'Export Template'; +$lang->caselib->batchCreateCase = 'Batch Create'; +$lang->caselib->import = 'Import'; +$lang->caselib->showImport = 'Imported Data'; +$lang->caselib->type = 'Type'; +$lang->caselib->product = $lang->productCommon; +$lang->caselib->browseAction = 'Caselib List'; +$lang->caselib->deleteAction = "Delete Caselib"; +$lang->caselib->importAction = 'Import Case'; +$lang->caselib->linkVersion = "Version"; $lang->caselib->id = 'ID'; $lang->caselib->name = 'Name'; diff --git a/module/caselib/lang/fr.php b/module/caselib/lang/fr.php index c169f5b2a6..829de7fdbc 100644 --- a/module/caselib/lang/fr.php +++ b/module/caselib/lang/fr.php @@ -12,25 +12,25 @@ $lang->caselib->common = 'Case Library'; $lang->caselib->all = 'All Case Libraries'; -$lang->caselib->index = "Accueil Library"; -$lang->caselib->create = "Créer une Library"; -$lang->caselib->edit = 'Editer Library'; -$lang->caselib->browse = 'Voir CasTests dans Library'; -$lang->caselib->view = 'Détail Library'; -$lang->caselib->createCase = 'Créer CasTest'; -$lang->caselib->delete = "Supprimer Suite"; -$lang->caselib->linkVersion = "Version"; -$lang->caselib->deleted = 'Supprimé'; -$lang->caselib->exportTemplate = 'Exporter Modèle'; -$lang->caselib->batchCreateCase = 'Créer par lot'; -$lang->caselib->import = 'Importer'; -$lang->caselib->showImport = 'Données Importées'; -$lang->caselib->type = 'Type'; -$lang->caselib->product = $lang->productCommon; -$lang->caselib->browseAction = 'Caselib List'; -$lang->caselib->deleteAction = "Delete Caselib"; -$lang->caselib->importAction = 'Importer CasTest'; -$lang->caselib->linkVersion = "Version"; +$lang->caselib->index = "Accueil Library"; +$lang->caselib->create = "Créer une Library"; +$lang->caselib->edit = 'Editer Library'; +$lang->caselib->browse = 'Voir CasTests dans Library'; +$lang->caselib->view = 'Détail Library'; +$lang->caselib->createCase = 'Créer CasTest'; +$lang->caselib->delete = "Supprimer Suite"; +$lang->caselib->linkVersion = "Version"; +$lang->caselib->deleted = 'Supprimé'; +$lang->caselib->exportTemplate = 'Exporter Modèle'; +$lang->caselib->batchCreateCase = 'Créer par lot'; +$lang->caselib->import = 'Importer'; +$lang->caselib->showImport = 'Données Importées'; +$lang->caselib->type = 'Type'; +$lang->caselib->product = $lang->productCommon; +$lang->caselib->browseAction = 'Caselib List'; +$lang->caselib->deleteAction = "Delete Caselib"; +$lang->caselib->importAction = 'Importer CasTest'; +$lang->caselib->linkVersion = "Version"; $lang->caselib->id = 'ID'; $lang->caselib->name = 'Nom'; diff --git a/module/caselib/lang/zh-cn.php b/module/caselib/lang/zh-cn.php index 1f30e8c5f1..adee941f47 100644 --- a/module/caselib/lang/zh-cn.php +++ b/module/caselib/lang/zh-cn.php @@ -12,25 +12,25 @@ $lang->caselib->common = '用例库'; $lang->caselib->all = '所有用例库'; -$lang->caselib->index = "用例库首页"; -$lang->caselib->create = "创建用例库"; -$lang->caselib->edit = '编辑用例库'; -$lang->caselib->browse = '浏览用例库'; -$lang->caselib->view = '查看库概况'; -$lang->caselib->createCase = '创建用例'; -$lang->caselib->delete = "删除"; -$lang->caselib->linkVersion = "版本"; -$lang->caselib->deleted = '已删除'; -$lang->caselib->exportTemplate = '导出模板'; -$lang->caselib->batchCreateCase = '批量创建用例'; -$lang->caselib->import = '导入'; -$lang->caselib->showImport = '显示导入数据'; -$lang->caselib->type = '类型'; -$lang->caselib->product = '所属' . $lang->productCommon; -$lang->caselib->browseAction = '用例库列表'; -$lang->caselib->deleteAction = "删除用例库"; -$lang->caselib->importAction = '导入用例'; -$lang->caselib->linkVersion = "版本"; +$lang->caselib->index = "用例库首页"; +$lang->caselib->create = "创建用例库"; +$lang->caselib->edit = '编辑用例库'; +$lang->caselib->browse = '浏览用例库'; +$lang->caselib->view = '查看库概况'; +$lang->caselib->createCase = '创建用例'; +$lang->caselib->delete = "删除"; +$lang->caselib->linkVersion = "版本"; +$lang->caselib->deleted = '已删除'; +$lang->caselib->exportTemplate = '导出模板'; +$lang->caselib->batchCreateCase = '批量创建用例'; +$lang->caselib->import = '导入'; +$lang->caselib->showImport = '显示导入数据'; +$lang->caselib->type = '类型'; +$lang->caselib->product = '所属' . $lang->productCommon; +$lang->caselib->browseAction = '用例库列表'; +$lang->caselib->deleteAction = "删除用例库"; +$lang->caselib->importAction = '导入用例'; +$lang->caselib->linkVersion = "版本"; $lang->caselib->id = '编号'; $lang->caselib->name = '名称'; diff --git a/module/port/lang/zh-cn.php b/module/port/lang/zh-cn.php index 094104e416..f74f8947ed 100644 --- a/module/port/lang/zh-cn.php +++ b/module/port/lang/zh-cn.php @@ -11,7 +11,6 @@ $lang->port->reservedWord['name'] = '名称'; $lang->port->reservedWord['title'] = '标题'; $lang->port->reservedWord['asdawdadw'] = '测试字段'; - $lang->port->importCase = '导入EXCEL'; $lang->port->importNotice = '请先导出模板，按照模板格式填写数据后再导入。'; $lang->port->noRequire = '%s行的“ %s” 是必填字段，不能为空。'; diff --git a/module/port/model.php b/module/port/model.php index 7ef2fc73b7..dc43466488 100644 --- a/module/port/model.php +++ b/module/port/model.php @@ -332,10 +332,7 @@ class portModel extends model { $values = $fieldValue['values']; - if($values and (strpos($this->portConfig->sysDataFields, $values) !== false)) - { - return $this->portConfig->sysDataList[$values]; - } + if($values and (strpos($this->portConfig->sysDataFields, $values) !== false)) return $this->portConfig->sysDataList[$values]; if(!$fieldValue['dataSource']) return $values; diff --git a/module/port/view/tfoot.html.php b/module/port/view/tfoot.html.php index fee5826cb2..8592b53094 100644 --- a/module/port/view/tfoot.html.php +++ b/module/port/view/tfoot.html.php @@ -1,21 +1,21 @@ - - - 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($backLink, $lang->goback, '', "class='btn btn-back btn-wide'"); - echo '   ' . sprintf($lang->file->importPager, $allCount, $pagerID, $allPager); - ?> - - + + + 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($backLink, $lang->goback, '', "class='btn btn-back btn-wide'"); + echo '   ' . sprintf($lang->file->importPager, $allCount, $pagerID, $allPager); + ?> + +