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

* Format code for port.

Browse Source
This commit is contained in:
tanghucheng
2022-08-08 12:15:28 +08:00
parent 36b07367c9
commit 2eec12eeac
8 changed files with 101 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/model.php
+3 -7
View File
@@ -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';
module/caselib/lang/de.php
+19 -19
View File
@@ -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';
module/caselib/lang/en.php
+19 -19
View File
@@ -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';
module/caselib/lang/fr.php
+19 -19
View File
@@ -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';
module/caselib/lang/zh-cn.php
+19 -19
View File
@@ -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 = '名称';
module/port/lang/zh-cn.php
-1
View File
@@ -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” 是必填字段，不能为空。';
module/port/model.php
+1 -4
View File
@@ -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;
module/port/view/tfoot.html.php
+21 -21
View File
@@ -1,21 +1,21 @@
<tr>
<td colspan='10' class='text-center form-actions'>
<?php
$submitText = $isEndPage ? $this->lang->save : $this->lang->file->saveAndNext;
$isStartPage = $pagerID == 1 ? true : false;
if(!$insert and $dataInsert === '')
{
echo "<button type='button' data-toggle='modal' data-target='#importNoticeModal' class='btn btn-primary btn-wide'>{$submitText}</button>";
}
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 ' &nbsp; ' . html::a($backLink, $lang->goback, '', "class='btn btn-back btn-wide'");
echo ' &nbsp; ' . sprintf($lang->file->importPager, $allCount, $pagerID, $allPager);
?>
</td>
</tr>
<tr>
<td colspan='10' class='text-center form-actions'>
<?php
$submitText = $isEndPage ? $this->lang->save : $this->lang->file->saveAndNext;
$isStartPage = $pagerID == 1 ? true : false;
if(!$insert and $dataInsert === '')
{
echo "<button type='button' data-toggle='modal' data-target='#importNoticeModal' class='btn btn-primary btn-wide'>{$submitText}</button>";
}
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 ' &nbsp; ' . html::a($backLink, $lang->goback, '', "class='btn btn-back btn-wide'");
echo ' &nbsp; ' . sprintf($lang->file->importPager, $allCount, $pagerID, $allPager);
?>
</td>
</tr>