From ffb8077e2c0591ee26225d93dfbb3953d43a4219 Mon Sep 17 00:00:00 2001
From: caoyanyi
Date: Mon, 8 Aug 2022 08:51:34 +0800
Subject: [PATCH 033/106] * Modify restore repo tips.
---
module/action/lang/de.php | 1 +
module/action/lang/en.php | 1 +
module/action/lang/fr.php | 1 +
module/action/lang/vi.php | 17 ++++++++++-------
module/action/lang/zh-cn.php | 1 +
module/action/model.php | 10 ++++++++++
module/gitlab/control.php | 4 ++--
7 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/module/action/lang/de.php b/module/action/lang/de.php
index 0862355a3d..3303ad2c04 100644
--- a/module/action/lang/de.php
+++ b/module/action/lang/de.php
@@ -57,6 +57,7 @@ $lang->action->historyEdit = 'Der Verlauf darf nicht leer sein.';
$lang->action->noDynamic = 'Kein Verlauf. ';
$lang->action->undeletedTips = 'This data did not participate in the merging process during the version upgrade process, so restore is not supported.';
$lang->action->executionNoProject = 'The execution does not belong to a project,please restore the project first';
+$lang->action->repoNoServer = 'The repo does not belong to a server,please restore the server first';
$lang->action->repeatChange = '%s with the same name and code already exists in the system, After recovery, the name are \"%s\",the code are \"%s\".';
$lang->action->nameRepeatChange = '%s with the same name already exists in the system, After recovery, the name are \"%s\".';
diff --git a/module/action/lang/en.php b/module/action/lang/en.php
index ea98cc89f2..76b858b6c9 100755
--- a/module/action/lang/en.php
+++ b/module/action/lang/en.php
@@ -57,6 +57,7 @@ $lang->action->historyEdit = 'The history EditBy cannot be empty.';
$lang->action->noDynamic = 'No dynamics. ';
$lang->action->undeletedTips = 'This data did not participate in the merging process during the version upgrade process, so restore is not supported.';
$lang->action->executionNoProject = 'The execution does not belong to a project,please restore the project first';
+$lang->action->repoNoServer = 'The repo does not belong to a server,please restore the server first';
$lang->action->repeatChange = '%s with the same name and code already exists in the system, After recovery, the name are \"%s\",the code are \"%s\".';
$lang->action->nameRepeatChange = '%s with the same name already exists in the system, After recovery, the name are \"%s\".';
diff --git a/module/action/lang/fr.php b/module/action/lang/fr.php
index 79658c8d38..73e0a3f534 100644
--- a/module/action/lang/fr.php
+++ b/module/action/lang/fr.php
@@ -57,6 +57,7 @@ $lang->action->historyEdit = "l'historique Edité Par ne peut pas être v
$lang->action->noDynamic = "Pas d'historique.";
$lang->action->undeletedTips = 'This data did not participate in the merging process during the version upgrade process, so restore is not supported.';
$lang->action->executionNoProject = 'The execution does not belong to a project,please restore the project first';
+$lang->action->repoNoServer = 'The repo does not belong to a server,please restore the server first';
$lang->action->repeatChange = '%s with the same name and code already exists in the system, After recovery, the name are \"%s\",the code are \"%s\".';
$lang->action->nameRepeatChange = '%s with the same name already exists in the system, After recovery, the name are \"%s\".';
diff --git a/module/action/lang/vi.php b/module/action/lang/vi.php
index 2380f3d519..fdaccee1bb 100644
--- a/module/action/lang/vi.php
+++ b/module/action/lang/vi.php
@@ -30,13 +30,16 @@ $lang->action->editComment = 'Sửa nhận xét';
$lang->action->create = 'Thêm nhận xét';
$lang->action->comment = 'Nhận xét';
-$lang->action->trashTips = 'Ghi chú: Xóa trong ZenTao là hợp lệ.';
-$lang->action->textDiff = 'Định dạng văn bản';
-$lang->action->original = 'Định dạng gốc';
-$lang->action->confirmHideAll = 'Bạn có muốn ẩn tất cả ghi nhận này?';
-$lang->action->needEdit = '%s mà bạn muốn khôi phục. Vui lòng edit it.';
-$lang->action->historyEdit = 'Lịch sử người cập nhật không thể trống.';
-$lang->action->noDynamic = 'Không có lịch sử. ';
+$lang->action->trashTips = 'Ghi chú: Xóa trong ZenTao là hợp lệ.';
+$lang->action->textDiff = 'Định dạng văn bản';
+$lang->action->original = 'Định dạng gốc';
+$lang->action->confirmHideAll = 'Bạn có muốn ẩn tất cả ghi nhận này?';
+$lang->action->needEdit = '%s mà bạn muốn khôi phục. Vui lòng edit it.';
+$lang->action->historyEdit = 'Lịch sử người cập nhật không thể trống.';
+$lang->action->noDynamic = 'Không có lịch sử. ';
+$lang->action->undeletedTips = 'This data did not participate in the merging process during the version upgrade process, so restore is not supported.';
+$lang->action->executionNoProject = 'The execution does not belong to a project,please restore the project first';
+$lang->action->repoNoServer = 'The repo does not belong to a server,please restore the server first';
$lang->action->history = new stdclass();
$lang->action->history->action = 'Liên kết';
diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php
index 3311fc6a07..07ea3ecea1 100755
--- a/module/action/lang/zh-cn.php
+++ b/module/action/lang/zh-cn.php
@@ -57,6 +57,7 @@ $lang->action->historyEdit = '历史记录编辑不能为空。';
$lang->action->noDynamic = '暂时没有动态。';
$lang->action->undeletedTips = '该数据在版本升级过程中未参与数据归并流程，不支持还原。';
$lang->action->executionNoProject = '该执行没有所属的项目，请先还原项目再还原执行';
+$lang->action->repoNoServer = '该代码库没有所属的服务器，请先还原服务器再还原代码库';
$lang->action->repeatChange = '系统内已有同名、同代号的%s，恢复后名称为\"%s\"、代号为\"%s\"。';
$lang->action->nameRepeatChange = '系统内已有同名的%s，恢复后名称为\"%s\"。';
diff --git a/module/action/model.php b/module/action/model.php
index 7ae41b46a1..3b84d1e2c2 100755
--- a/module/action/model.php
+++ b/module/action/model.php
@@ -1727,6 +1727,16 @@ class actionModel extends model
if((int)$projectCount == 0) return print(js::error($this->lang->action->executionNoProject));
}
+ if($action->objectType == 'repo')
+ {
+ $repo = $this->dao->select('*')->from(TABLE_REPO)->where('id')->eq($action->objectID)->fetch();
+ if($repo and in_array($repo->SCM, array('Gitlab', 'Gitea', 'Gogs')))
+ {
+ $server = $this->dao->select('*')->from(TABLE_PIPELINE)->where('id')->eq($repo->serviceHost)->andWhere('deleted')->eq('0')->fetch();
+ if(empty($server)) return print(js::error($this->lang->action->repoNoServer));
+ }
+ }
+
if($action->objectType == 'product')
{
$product = $this->dao->select('id,name,code,acl')->from(TABLE_PRODUCT)->where('id')->eq($action->objectID)->fetch();
diff --git a/module/gitlab/control.php b/module/gitlab/control.php
index 622ee928bd..4994faa544 100644
--- a/module/gitlab/control.php
+++ b/module/gitlab/control.php
@@ -228,8 +228,8 @@ class gitlab extends control
{
if($confirm != 'yes') return print(js::confirm($this->lang->gitlab->confirmDelete, inlink('delete', "id=$id&confirm=yes")));
- $oldGitea = $this->loadModel('pipeline')->getByID($id);
- $actionID = $this->pipeline->delete($id, 'gitlab');
+ $oldGitlab = $this->loadModel('pipeline')->getByID($id);
+ $actionID = $this->pipeline->delete($id, 'gitlab');
if(!$actionID) return print(js::error($this->lang->pipeline->delError));
$gitLab = $this->gitlab->getByID($id);
From 5e3017c1b3bb1b895f12894dd5cc0f040d5a4fcc Mon Sep 17 00:00:00 2001
From: caoyanyi
Date: Mon, 8 Aug 2022 16:54:29 +0800
Subject: [PATCH 034/106] * Optimize repo view style.
---
module/repo/control.php | 1 +
module/repo/css/common.css | 1 +
module/repo/view/view.html.php | 26 ++++++++++++++++----------
3 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/module/repo/control.php b/module/repo/control.php
index 8f4ccb9be0..6abc0c51b3 100644
--- a/module/repo/control.php
+++ b/module/repo/control.php
@@ -343,6 +343,7 @@ class repo extends control
$this->view->pager = $pager;
$this->view->logType = $logType;
$this->view->info = $info;
+ $this->view->pathInfo = $pathInfo;
$this->view->title = $this->lang->repo->common . $this->lang->colon . $this->lang->repo->view;
$this->view->position[] = $this->lang->repo->common;
diff --git a/module/repo/css/common.css b/module/repo/css/common.css
index c806e26440..8294e2ffa4 100644
--- a/module/repo/css/common.css
+++ b/module/repo/css/common.css
@@ -192,3 +192,4 @@ h3 {font-size: 16px;}
.dropdown-menu li > a.selected {color: #3123ae !important; background: #f2eafc !important; line-height: 20px; border-radius: 5px;}
.tips-git a {padding-bottom: 1px;}
+.bug-lines {font-size: revert;}
diff --git a/module/repo/view/view.html.php b/module/repo/view/view.html.php
index b6596fd902..a21b6dc656 100644
--- a/module/repo/view/view.html.php
+++ b/module/repo/view/view.html.php
@@ -20,7 +20,7 @@ $version = " $revisionName";
" : '';
foreach($projects as $id => $name)
{
From 3e6052ae5fe51507a1f5b94f81da145741d65c67 Mon Sep 17 00:00:00 2001
From: sunguangming
Date: Tue, 16 Aug 2022 13:02:25 +0800
Subject: [PATCH 073/106] * Fix bug #26465.
---
module/tree/lang/de.php | 78 +++++++++++++++++++------------------
module/tree/lang/en.php | 78 +++++++++++++++++++------------------
module/tree/lang/fr.php | 78 +++++++++++++++++++------------------
module/tree/lang/vi.php | 74 ++++++++++++++++++-----------------
module/tree/lang/zh-cn.php | 80 +++++++++++++++++++-------------------
module/tree/lang/zh-tw.php | 0
6 files changed, 199 insertions(+), 189 deletions(-)
mode change 100644 => 100755 module/tree/lang/de.php
mode change 100644 => 100755 module/tree/lang/en.php
mode change 100644 => 100755 module/tree/lang/fr.php
mode change 100644 => 100755 module/tree/lang/vi.php
mode change 100644 => 100755 module/tree/lang/zh-cn.php
mode change 100644 => 100755 module/tree/lang/zh-tw.php
diff --git a/module/tree/lang/de.php b/module/tree/lang/de.php
old mode 100644
new mode 100755
index 7b81ef314a..6789dce35c
--- a/module/tree/lang/de.php
+++ b/module/tree/lang/de.php
@@ -10,44 +10,46 @@
* @link http://www.zentao.net
*/
$lang->tree = new stdclass();
-$lang->tree->common = 'Modul';
-$lang->tree->edit = 'Bearbeiten';
-$lang->tree->delete = 'Löschen';
-$lang->tree->browse = 'Allgemeine Module verwalten';
-$lang->tree->browseTask = 'Aufgaben Modul verwalten';
-$lang->tree->manage = 'Modul verwalten';
-$lang->tree->fix = 'Fix';
-$lang->tree->manageProduct = "Verwalte {$lang->productCommon}";
-$lang->tree->manageExecution = "Verwalte {$lang->executionCommon}";
-$lang->tree->manageLine = "Manage {$lang->productCommon} Line";
-$lang->tree->manageBug = 'Verwalte Bugs';
-$lang->tree->manageCase = 'Verwalte Fälle';
-$lang->tree->manageCaseLib = 'Verwalte Bibliothek';
-$lang->tree->manageCustomDoc = 'Verwalte Dokumente';
-$lang->tree->manageApiChild = 'Manage API Directory';
-$lang->tree->updateOrder = 'Sortierung';
-$lang->tree->manageChild = 'Verwalte Untermodul';
-$lang->tree->manageStoryChild = 'Verwalte Untermodul';
-$lang->tree->manageLineChild = 'Verwalte Produktlinie';
-$lang->tree->manageBugChild = 'Verwalte Bugs';
-$lang->tree->manageCaseChild = 'Verwalte Fälle';
-$lang->tree->manageCaselibChild = 'Verwalte Bibliothek';
-$lang->tree->manageTaskChild = "Verwalte {$lang->executionCommon}";
-$lang->tree->syncFromProduct = "Copy from Other {$lang->productCommon}s";
-$lang->tree->dragAndSort = "Ziehen und Sotieren";
-$lang->tree->sort = "Sortieren";
-$lang->tree->addChild = "Hinzufügen";
-$lang->tree->confirmDelete = 'Do you want to delete this module and its child modules?';
-$lang->tree->confirmDeleteMenu = 'Do you want to delete this menu and its child menus?';
-$lang->tree->confirmDelCategory = 'Möchten Sie diese Kategorie und ihre Kinderkategorien löschen?';
-$lang->tree->confirmDeleteLine = "Do you want to delete this {$lang->productCommon} line?";
-$lang->tree->confirmRoot = "Any changes to the {$lang->productCommon} will change the stories, bugs, cases of {$lang->productCommon} it belongs to, as well as the linkage of {$lang->executionCommon} and {$lang->productCommon}, which is dangerous. Do you want to change it?";
-$lang->tree->confirmRoot4Doc = "Any changes to the library will change the document of library it belongs to, which is dangerous. Do you want to change it?";
-$lang->tree->noSubmodule = "There are no copyable submodules under the current module!";
-$lang->tree->successSave = 'Saved.';
-$lang->tree->successFixed = 'Fixed.';
-$lang->tree->repeatName = 'The name "%s" exists!';
-$lang->tree->shouldNotBlank = 'Module name should not be blank!';
+$lang->tree->common = 'Modul';
+$lang->tree->edit = 'Bearbeiten';
+$lang->tree->delete = 'Löschen';
+$lang->tree->browse = 'Allgemeine Module verwalten';
+$lang->tree->browseTask = 'Aufgaben Modul verwalten';
+$lang->tree->manage = 'Modul verwalten';
+$lang->tree->fix = 'Fix';
+$lang->tree->manageProduct = "Verwalte {$lang->productCommon}";
+$lang->tree->manageExecution = "Verwalte {$lang->executionCommon}";
+$lang->tree->manageLine = "Manage {$lang->productCommon} Line";
+$lang->tree->manageBug = 'Verwalte Bugs';
+$lang->tree->manageCase = 'Verwalte Fälle';
+$lang->tree->manageCaseLib = 'Verwalte Bibliothek';
+$lang->tree->manageCustomDoc = 'Verwalte Dokumente';
+$lang->tree->manageApiChild = 'Manage API Directory';
+$lang->tree->updateOrder = 'Sortierung';
+$lang->tree->manageChild = 'Verwalte Untermodul';
+$lang->tree->manageStoryChild = 'Verwalte Untermodul';
+$lang->tree->manageLineChild = 'Verwalte Produktlinie';
+$lang->tree->manageBugChild = 'Verwalte Bugs';
+$lang->tree->manageCaseChild = 'Verwalte Fälle';
+$lang->tree->manageCaselibChild = 'Verwalte Bibliothek';
+$lang->tree->manageDashboard = 'Manage Dashboard Module';
+$lang->tree->manageDashboardChild = 'Manage Dashboard Child Module';
+$lang->tree->manageTaskChild = "Verwalte {$lang->executionCommon}";
+$lang->tree->syncFromProduct = "Copy from Other {$lang->productCommon}s";
+$lang->tree->dragAndSort = "Ziehen und Sotieren";
+$lang->tree->sort = "Sortieren";
+$lang->tree->addChild = "Hinzufügen";
+$lang->tree->confirmDelete = 'Do you want to delete this module and its child modules?';
+$lang->tree->confirmDeleteMenu = 'Do you want to delete this menu and its child menus?';
+$lang->tree->confirmDelCategory = 'Möchten Sie diese Kategorie und ihre Kinderkategorien löschen?';
+$lang->tree->confirmDeleteLine = "Do you want to delete this {$lang->productCommon} line?";
+$lang->tree->confirmRoot = "Any changes to the {$lang->productCommon} will change the stories, bugs, cases of {$lang->productCommon} it belongs to, as well as the linkage of {$lang->executionCommon} and {$lang->productCommon}, which is dangerous. Do you want to change it?";
+$lang->tree->confirmRoot4Doc = "Any changes to the library will change the document of library it belongs to, which is dangerous. Do you want to change it?";
+$lang->tree->noSubmodule = "There are no copyable submodules under the current module!";
+$lang->tree->successSave = 'Saved.';
+$lang->tree->successFixed = 'Fixed.';
+$lang->tree->repeatName = 'The name "%s" exists!';
+$lang->tree->shouldNotBlank = 'Module name should not be blank!';
$lang->tree->module = 'Modul';
$lang->tree->name = 'Name';
diff --git a/module/tree/lang/en.php b/module/tree/lang/en.php
old mode 100644
new mode 100755
index a0d96af45a..e38a92c257
--- a/module/tree/lang/en.php
+++ b/module/tree/lang/en.php
@@ -10,44 +10,46 @@
* @link http://www.zentao.net
*/
$lang->tree = new stdclass();
-$lang->tree->common = 'Module';
-$lang->tree->edit = 'Edit Module';
-$lang->tree->delete = 'Delete Module';
-$lang->tree->browse = 'Manage General Module';
-$lang->tree->browseTask = 'Manage Task Module';
-$lang->tree->manage = 'Manage Module';
-$lang->tree->fix = 'Fix Module';
-$lang->tree->manageProduct = "Manage {$lang->productCommon} Modules";
-$lang->tree->manageExecution = "Manage {$lang->execution->common} Modules";
-$lang->tree->manageLine = "Manage {$lang->productCommon} Line";
-$lang->tree->manageBug = 'Manage Bug';
-$lang->tree->manageCase = 'Manage Case';
-$lang->tree->manageCaseLib = 'Manage Library';
-$lang->tree->manageCustomDoc = 'Manage Document Library';
-$lang->tree->manageApiChild = 'Manage API Directory';
-$lang->tree->updateOrder = 'Rank Module';
-$lang->tree->manageChild = 'Manage Child Modules';
-$lang->tree->manageStoryChild = 'Manage Child Modules';
-$lang->tree->manageLineChild = "Manage {$lang->productCommon} Line";
-$lang->tree->manageBugChild = 'Manage Child Modules of Bugs';
-$lang->tree->manageCaseChild = 'Manage Child Cases';
-$lang->tree->manageCaselibChild = 'Manage Child Libraries';
-$lang->tree->manageTaskChild = "Manage Child {$lang->execution->common} Modules";
-$lang->tree->syncFromProduct = "Copy from Other {$lang->productCommon}s";
-$lang->tree->dragAndSort = "Drag to order";
-$lang->tree->sort = "Order";
-$lang->tree->addChild = "Add Child Module";
-$lang->tree->confirmDelete = 'Do you want to delete this module and its child modules?';
-$lang->tree->confirmDeleteMenu = 'Do you want to delete this menu and its child menus?';
-$lang->tree->confirmDelCategory = 'Do you want to delete this category and its child categories?';
-$lang->tree->confirmDeleteLine = "Do you want to delete this {$lang->productCommon} line?";
-$lang->tree->confirmRoot = "Any changes to the {$lang->productCommon} will change the stories, bugs, cases of {$lang->productCommon} it belongs to, as well as the linkage of {$lang->executionCommon} and {$lang->productCommon}, which is dangerous. Do you want to change it?";
-$lang->tree->confirmRoot4Doc = "Any changes to the library will change the document of library it belongs to, which is dangerous. Do you want to change it?";
-$lang->tree->noSubmodule = "There are no copyable submodules under the current module!";
-$lang->tree->successSave = 'Saved.';
-$lang->tree->successFixed = 'Fixed.';
-$lang->tree->repeatName = 'The name "%s" exists!';
-$lang->tree->shouldNotBlank = 'Module name should not be blank!';
+$lang->tree->common = 'Module';
+$lang->tree->edit = 'Edit Module';
+$lang->tree->delete = 'Delete Module';
+$lang->tree->browse = 'Manage General Module';
+$lang->tree->browseTask = 'Manage Task Module';
+$lang->tree->manage = 'Manage Module';
+$lang->tree->fix = 'Fix Module';
+$lang->tree->manageProduct = "Manage {$lang->productCommon} Modules";
+$lang->tree->manageExecution = "Manage {$lang->execution->common} Modules";
+$lang->tree->manageLine = "Manage {$lang->productCommon} Line";
+$lang->tree->manageBug = 'Manage Bug';
+$lang->tree->manageCase = 'Manage Case';
+$lang->tree->manageCaseLib = 'Manage Library';
+$lang->tree->manageCustomDoc = 'Manage Document Library';
+$lang->tree->manageApiChild = 'Manage API Directory';
+$lang->tree->updateOrder = 'Rank Module';
+$lang->tree->manageChild = 'Manage Child Modules';
+$lang->tree->manageStoryChild = 'Manage Child Modules';
+$lang->tree->manageLineChild = "Manage {$lang->productCommon} Line";
+$lang->tree->manageBugChild = 'Manage Child Modules of Bugs';
+$lang->tree->manageCaseChild = 'Manage Child Cases';
+$lang->tree->manageCaselibChild = 'Manage Child Libraries';
+$lang->tree->manageDashboard = 'Manage Dashboard Module';
+$lang->tree->manageDashboardChild = 'Manage Dashboard Child Module';
+$lang->tree->manageTaskChild = "Manage Child {$lang->execution->common} Modules";
+$lang->tree->syncFromProduct = "Copy from Other {$lang->productCommon}s";
+$lang->tree->dragAndSort = "Drag to order";
+$lang->tree->sort = "Order";
+$lang->tree->addChild = "Add Child Module";
+$lang->tree->confirmDelete = 'Do you want to delete this module and its child modules?';
+$lang->tree->confirmDeleteMenu = 'Do you want to delete this menu and its child menus?';
+$lang->tree->confirmDelCategory = 'Do you want to delete this category and its child categories?';
+$lang->tree->confirmDeleteLine = "Do you want to delete this {$lang->productCommon} line?";
+$lang->tree->confirmRoot = "Any changes to the {$lang->productCommon} will change the stories, bugs, cases of {$lang->productCommon} it belongs to, as well as the linkage of {$lang->executionCommon} and {$lang->productCommon}, which is dangerous. Do you want to change it?";
+$lang->tree->confirmRoot4Doc = "Any changes to the library will change the document of library it belongs to, which is dangerous. Do you want to change it?";
+$lang->tree->noSubmodule = "There are no copyable submodules under the current module!";
+$lang->tree->successSave = 'Saved.';
+$lang->tree->successFixed = 'Fixed.';
+$lang->tree->repeatName = 'The name "%s" exists!';
+$lang->tree->shouldNotBlank = 'Module name should not be blank!';
$lang->tree->module = 'Module';
$lang->tree->name = 'Module Name';
diff --git a/module/tree/lang/fr.php b/module/tree/lang/fr.php
old mode 100644
new mode 100755
index 644eaa3b38..878c047632
--- a/module/tree/lang/fr.php
+++ b/module/tree/lang/fr.php
@@ -10,44 +10,46 @@
* @link http://www.zentao.net
*/
$lang->tree = new stdclass();
-$lang->tree->common = 'Module';
-$lang->tree->edit = 'Editer Module';
-$lang->tree->delete = 'Supprimer Module';
-$lang->tree->browse = 'Gérer les Modules Généraux';
-$lang->tree->browseTask = 'Gérer les Modules Tâche';
-$lang->tree->manage = 'Gérer les Modules';
-$lang->tree->fix = 'Corrigez Module';
-$lang->tree->manageProduct = "Gérer les Modules {$lang->productCommon}";
-$lang->tree->manageExecution = "Gérer les Modules {$lang->executionCommon}";
-$lang->tree->manageLine = 'Gérer Ligne Produit';
-$lang->tree->manageBug = 'Gérer Bugs';
-$lang->tree->manageCase = 'Gérer CasTests';
-$lang->tree->manageCaseLib = 'Gérer Librairie de recette';
-$lang->tree->manageCustomDoc = 'Gérer la librairie de Doc';
-$lang->tree->manageApiChild = 'Manage API Directory';
-$lang->tree->updateOrder = 'Rang Module';
-$lang->tree->manageChild = 'Gérer Sous-Module';
-$lang->tree->manageStoryChild = 'Gérer Sous-Module';
-$lang->tree->manageLineChild = 'Gérer Ligne Produit';
-$lang->tree->manageBugChild = 'Gérer Sous-Bugs';
-$lang->tree->manageCaseChild = 'Gérer Sous-CasTests';
-$lang->tree->manageCaselibChild = 'Gérer Sous-Librairies';
-$lang->tree->manageTaskChild = "Gérer Sous-Modules {$lang->executionCommon}";
-$lang->tree->syncFromProduct = "Copier d'un autre {$lang->productCommon}";
-$lang->tree->dragAndSort = "Faites glisser pour ordonner";
-$lang->tree->sort = "Ordonnez";
-$lang->tree->addChild = "Ajout Sous-Module";
-$lang->tree->confirmDelete = 'Voulez-vous supprimer ce module et tous ses sous-modules ?';
-$lang->tree->confirmDeleteMenu = 'Do you want to delete this menu and its child menus?';
-$lang->tree->confirmDelCategory = 'Voulez-vous supprimer cette catégorie et ses sous-catégories?';
-$lang->tree->confirmDeleteLine = 'Voulez-vous supprimer cette ligne de produit ?';
-$lang->tree->confirmRoot = "Les changements du {$lang->productCommon} vont impacter les stories, bugs, casTests du {$lang->productCommon} auquel ils appartiennent, ainsi que les associations de {$lang->executionCommon} et {$lang->productCommon}, ce qui est dangereux. Voulez-vous malgré tout effectuer le changement ?";
-$lang->tree->confirmRoot4Doc = "Toute modification apportée à la bibliothèque modifiera le document de la bibliothèque à laquelle elle appartient, ce qui est dangereux. Voulez-vous le changer ?";
-$lang->tree->noSubmodule = "There are no copyable submodules under the current module!";
-$lang->tree->successSave = 'Sauvé.';
-$lang->tree->successFixed = 'Corrigé.';
-$lang->tree->repeatName = 'Le nom "%s" existe déjà !';
-$lang->tree->shouldNotBlank = 'Module name should not be blank!';
+$lang->tree->common = 'Module';
+$lang->tree->edit = 'Editer Module';
+$lang->tree->delete = 'Supprimer Module';
+$lang->tree->browse = 'Gérer les Modules Généraux';
+$lang->tree->browseTask = 'Gérer les Modules Tâche';
+$lang->tree->manage = 'Gérer les Modules';
+$lang->tree->fix = 'Corrigez Module';
+$lang->tree->manageProduct = "Gérer les Modules {$lang->productCommon}";
+$lang->tree->manageExecution = "Gérer les Modules {$lang->executionCommon}";
+$lang->tree->manageLine = 'Gérer Ligne Produit';
+$lang->tree->manageBug = 'Gérer Bugs';
+$lang->tree->manageCase = 'Gérer CasTests';
+$lang->tree->manageCaseLib = 'Gérer Librairie de recette';
+$lang->tree->manageCustomDoc = 'Gérer la librairie de Doc';
+$lang->tree->manageApiChild = 'Manage API Directory';
+$lang->tree->updateOrder = 'Rang Module';
+$lang->tree->manageChild = 'Gérer Sous-Module';
+$lang->tree->manageStoryChild = 'Gérer Sous-Module';
+$lang->tree->manageLineChild = 'Gérer Ligne Produit';
+$lang->tree->manageBugChild = 'Gérer Sous-Bugs';
+$lang->tree->manageCaseChild = 'Gérer Sous-CasTests';
+$lang->tree->manageCaselibChild = 'Gérer Sous-Librairies';
+$lang->tree->manageDashboard = 'Manage Dashboard Module';
+$lang->tree->manageDashboardChild = 'Manage Dashboard Child Module';
+$lang->tree->manageTaskChild = "Gérer Sous-Modules {$lang->executionCommon}";
+$lang->tree->syncFromProduct = "Copier d'un autre {$lang->productCommon}";
+$lang->tree->dragAndSort = "Faites glisser pour ordonner";
+$lang->tree->sort = "Ordonnez";
+$lang->tree->addChild = "Ajout Sous-Module";
+$lang->tree->confirmDelete = 'Voulez-vous supprimer ce module et tous ses sous-modules ?';
+$lang->tree->confirmDeleteMenu = 'Do you want to delete this menu and its child menus?';
+$lang->tree->confirmDelCategory = 'Voulez-vous supprimer cette catégorie et ses sous-catégories?';
+$lang->tree->confirmDeleteLine = 'Voulez-vous supprimer cette ligne de produit ?';
+$lang->tree->confirmRoot = "Les changements du {$lang->productCommon} vont impacter les stories, bugs, casTests du {$lang->productCommon} auquel ils appartiennent, ainsi que les associations de {$lang->executionCommon} et {$lang->productCommon}, ce qui est dangereux. Voulez-vous malgré tout effectuer le changement ?";
+$lang->tree->confirmRoot4Doc = "Toute modification apportée à la bibliothèque modifiera le document de la bibliothèque à laquelle elle appartient, ce qui est dangereux. Voulez-vous le changer ?";
+$lang->tree->noSubmodule = "There are no copyable submodules under the current module!";
+$lang->tree->successSave = 'Sauvé.';
+$lang->tree->successFixed = 'Corrigé.';
+$lang->tree->repeatName = 'Le nom "%s" existe déjà !';
+$lang->tree->shouldNotBlank = 'Module name should not be blank!';
$lang->tree->module = 'Module';
$lang->tree->name = 'Nom';
diff --git a/module/tree/lang/vi.php b/module/tree/lang/vi.php
old mode 100644
new mode 100755
index f0900f94b3..d8252731c1
--- a/module/tree/lang/vi.php
+++ b/module/tree/lang/vi.php
@@ -10,42 +10,44 @@
* @link http://www.zentao.net
*/
$lang->tree = new stdclass();
-$lang->tree->common = 'Module';
-$lang->tree->edit = 'Sửa Module';
-$lang->tree->delete = 'Xóa Module';
-$lang->tree->browse = 'Quản lý module chung';
-$lang->tree->browseTask = 'Quản lý Module nhiệm vụ';
-$lang->tree->manage = 'Quản lý Module';
-$lang->tree->fix = 'Sửa Module';
-$lang->tree->manageProduct = "Quản lý module {$lang->productCommon}";
-$lang->tree->manageExecution = "Quản lý module {$lang->executionCommon}";
-$lang->tree->manageLine = "Quản lý dòng {$lang->productCommon}";
-$lang->tree->manageBug = 'Quản lý Bug';
-$lang->tree->manageCase = 'Quản lý tình huống';
-$lang->tree->manageCaseLib = 'Quản lý thư viện';
-$lang->tree->manageCustomDoc = 'Quản lý thư viện tài liệu';
-$lang->tree->updateOrder = 'Đánh giá Module';
-$lang->tree->manageChild = 'Quản lý module con';
-$lang->tree->manageStoryChild = 'Quản lý module con';
-$lang->tree->manageLineChild = "Quản lý dòng {$lang->productCommon}";
-$lang->tree->manageBugChild = 'Quản lý Bugs con';
-$lang->tree->manageCaseChild = 'Quản lý tình huống con';
-$lang->tree->manageCaselibChild = 'Quản lý thư viện con';
-$lang->tree->manageTaskChild = "Quản lý module {$lang->executionCommon} con";
-$lang->tree->syncFromProduct = "Sao chép từ {$lang->productCommon} khác";
-$lang->tree->dragAndSort = "Drag để sắp xếp";
-$lang->tree->sort = "Thứ tự";
-$lang->tree->addChild = "Thêm Module con";
-$lang->tree->confirmDelete = 'Bạn có muốn xóa module này và module con của nó?';
-$lang->tree->confirmDeleteMenu = 'Do you want to delete this menu and its child menus?';
-$lang->tree->confirmDelCategory = 'Bạn có muốn xoá hạng mục này và loại con của nó không?';
-$lang->tree->confirmDeleteLine = "Bạn có muốn xóa dòng {$lang->productCommon} này không?";
-$lang->tree->confirmRoot = "Mọi sự thay đổi tới {$lang->productCommon} này sẽ thay đổi the câu chuyện, bugs, tình huống của {$lang->productCommon} nó sở hữu, cũng như liên kết của {$lang->executionCommon} và {$lang->productCommon}, điều này nguy hiểm. Bạn có muốn thay đổi nó?";
-$lang->tree->confirmRoot4Doc = "Mọi sự thay đổi tới thư viện này sẽ thay đổi thư viện tài liệu nó sở hữu, điều này nguy hiểm. Bạn có muốn thay đổi nó?";
-$lang->tree->successSave = 'Đã lưu.';
-$lang->tree->successFixed = 'Đã sửa';
-$lang->tree->repeatName = 'Tên "%s" đã tồn tại!';
-$lang->tree->shouldNotBlank = 'Module name should not be blank!';
+$lang->tree->common = 'Module';
+$lang->tree->edit = 'Sửa Module';
+$lang->tree->delete = 'Xóa Module';
+$lang->tree->browse = 'Quản lý module chung';
+$lang->tree->browseTask = 'Quản lý Module nhiệm vụ';
+$lang->tree->manage = 'Quản lý Module';
+$lang->tree->fix = 'Sửa Module';
+$lang->tree->manageProduct = "Quản lý module {$lang->productCommon}";
+$lang->tree->manageExecution = "Quản lý module {$lang->executionCommon}";
+$lang->tree->manageLine = "Quản lý dòng {$lang->productCommon}";
+$lang->tree->manageBug = 'Quản lý Bug';
+$lang->tree->manageCase = 'Quản lý tình huống';
+$lang->tree->manageCaseLib = 'Quản lý thư viện';
+$lang->tree->manageCustomDoc = 'Quản lý thư viện tài liệu';
+$lang->tree->updateOrder = 'Đánh giá Module';
+$lang->tree->manageChild = 'Quản lý module con';
+$lang->tree->manageStoryChild = 'Quản lý module con';
+$lang->tree->manageLineChild = "Quản lý dòng {$lang->productCommon}";
+$lang->tree->manageBugChild = 'Quản lý Bugs con';
+$lang->tree->manageCaseChild = 'Quản lý tình huống con';
+$lang->tree->manageCaselibChild = 'Quản lý thư viện con';
+$lang->tree->manageDashboard = 'Manage Dashboard Module';
+$lang->tree->manageDashboardChild = 'Manage Dashboard Child Module';
+$lang->tree->manageTaskChild = "Quản lý module {$lang->executionCommon} con";
+$lang->tree->syncFromProduct = "Sao chép từ {$lang->productCommon} khác";
+$lang->tree->dragAndSort = "Drag để sắp xếp";
+$lang->tree->sort = "Thứ tự";
+$lang->tree->addChild = "Thêm Module con";
+$lang->tree->confirmDelete = 'Bạn có muốn xóa module này và module con của nó?';
+$lang->tree->confirmDeleteMenu = 'Do you want to delete this menu and its child menus?';
+$lang->tree->confirmDelCategory = 'Bạn có muốn xoá hạng mục này và loại con của nó không?';
+$lang->tree->confirmDeleteLine = "Bạn có muốn xóa dòng {$lang->productCommon} này không?";
+$lang->tree->confirmRoot = "Mọi sự thay đổi tới {$lang->productCommon} này sẽ thay đổi the câu chuyện, bugs, tình huống của {$lang->productCommon} nó sở hữu, cũng như liên kết của {$lang->executionCommon} và {$lang->productCommon}, điều này nguy hiểm. Bạn có muốn thay đổi nó?";
+$lang->tree->confirmRoot4Doc = "Mọi sự thay đổi tới thư viện này sẽ thay đổi thư viện tài liệu nó sở hữu, điều này nguy hiểm. Bạn có muốn thay đổi nó?";
+$lang->tree->successSave = 'Đã lưu.';
+$lang->tree->successFixed = 'Đã sửa';
+$lang->tree->repeatName = 'Tên "%s" đã tồn tại!';
+$lang->tree->shouldNotBlank = 'Module name should not be blank!';
$lang->tree->module = 'Module';
$lang->tree->name = 'Tên';
diff --git a/module/tree/lang/zh-cn.php b/module/tree/lang/zh-cn.php
old mode 100644
new mode 100755
index 3e34d65234..1c6c9a6a11
--- a/module/tree/lang/zh-cn.php
+++ b/module/tree/lang/zh-cn.php
@@ -9,45 +9,47 @@
* @version $Id: zh-cn.php 4836 2013-06-19 05:39:40Z zhujinyonging@gmail.com $
* @link http://www.zentao.net
*/
-$lang->tree = new stdclass();
-$lang->tree->common = '模块维护';
-$lang->tree->edit = '编辑模块';
-$lang->tree->delete = '删除模块';
-$lang->tree->browse = '通用模块维护';
-$lang->tree->browseTask = '任务模块维护';
-$lang->tree->manage = '维护模块';
-$lang->tree->fix = '修正数据';
-$lang->tree->manageProduct = "维护{$lang->productCommon}视图模块";
-$lang->tree->manageExecution = "维护{$lang->execution->common}视图模块";
-$lang->tree->manageLine = "维护{$lang->productCommon}线";
-$lang->tree->manageBug = '维护测试视图模块';
-$lang->tree->manageCase = '维护用例视图模块';
-$lang->tree->manageCaseLib = '维护用例库模块';
-$lang->tree->manageCustomDoc = '维护文档库分类';
-$lang->tree->manageApiChild = '维护接口库目录';
-$lang->tree->updateOrder = '更新排序';
-$lang->tree->manageChild = '维护子模块';
-$lang->tree->manageStoryChild = '维护子模块';
-$lang->tree->manageLineChild = "维护{$lang->productCommon}线";
-$lang->tree->manageBugChild = '维护Bug子模块';
-$lang->tree->manageCaseChild = '维护用例子模块';
-$lang->tree->manageCaselibChild = '维护用例库子模块';
-$lang->tree->manageTaskChild = "维护{$lang->execution->common}子模块";
-$lang->tree->syncFromProduct = '复制模块';
-$lang->tree->dragAndSort = "拖放排序";
-$lang->tree->sort = "排序";
-$lang->tree->addChild = "增加子模块";
-$lang->tree->confirmDelete = '该模块及其子模块都会被删除，您确定删除吗？';
-$lang->tree->confirmDeleteMenu = '该目录及其子目录都会被删除，您确定删除吗？';
-$lang->tree->confirmDelCategory = '该分类及其子分类都会被删除，您确定删除吗？';
-$lang->tree->confirmDeleteLine = "您确定删除该{$lang->productCommon}线吗？";
-$lang->tree->confirmRoot = "模块的所属{$lang->productCommon}修改，会关联修改该模块下的{$lang->SRCommon}、Bug、用例的所属{$lang->productCommon}，以及{$lang->executionCommon}和{$lang->productCommon}的关联关系。该操作比较危险，请谨慎操作。是否确认修改？";
-$lang->tree->confirmRoot4Doc = "修改所属文档库，会同时修改该分类下文档的关联关系。该操作比较危险，请谨慎操作。是否确认修改？";
-$lang->tree->noSubmodule = "当前模块下没有可复制的子模块！";
-$lang->tree->successSave = '成功保存';
-$lang->tree->successFixed = '成功修正数据！';
-$lang->tree->repeatName = '模块名“%s”已经存在！';
-$lang->tree->shouldNotBlank = '模块名不能为空格！';
+$lang->tree = new stdclass();
+$lang->tree->common = '模块维护';
+$lang->tree->edit = '编辑模块';
+$lang->tree->delete = '删除模块';
+$lang->tree->browse = '通用模块维护';
+$lang->tree->browseTask = '任务模块维护';
+$lang->tree->manage = '维护模块';
+$lang->tree->fix = '修正数据';
+$lang->tree->manageProduct = "维护{$lang->productCommon}视图模块";
+$lang->tree->manageExecution = "维护{$lang->execution->common}视图模块";
+$lang->tree->manageLine = "维护{$lang->productCommon}线";
+$lang->tree->manageBug = '维护测试视图模块';
+$lang->tree->manageCase = '维护用例视图模块';
+$lang->tree->manageCaseLib = '维护用例库模块';
+$lang->tree->manageCustomDoc = '维护文档库分类';
+$lang->tree->manageApiChild = '维护接口库目录';
+$lang->tree->updateOrder = '更新排序';
+$lang->tree->manageChild = '维护子模块';
+$lang->tree->manageStoryChild = '维护子模块';
+$lang->tree->manageLineChild = "维护{$lang->productCommon}线";
+$lang->tree->manageBugChild = '维护Bug子模块';
+$lang->tree->manageCaseChild = '维护用例子模块';
+$lang->tree->manageCaselibChild = '维护用例库子模块';
+$lang->tree->manageDashboard = '维护仪表盘模块';
+$lang->tree->manageDashboardChild = '维护仪表盘子模块';
+$lang->tree->manageTaskChild = "维护{$lang->execution->common}子模块";
+$lang->tree->syncFromProduct = '复制模块';
+$lang->tree->dragAndSort = "拖放排序";
+$lang->tree->sort = "排序";
+$lang->tree->addChild = "增加子模块";
+$lang->tree->confirmDelete = '该模块及其子模块都会被删除，您确定删除吗？';
+$lang->tree->confirmDeleteMenu = '该目录及其子目录都会被删除，您确定删除吗？';
+$lang->tree->confirmDelCategory = '该分类及其子分类都会被删除，您确定删除吗？';
+$lang->tree->confirmDeleteLine = "您确定删除该{$lang->productCommon}线吗？";
+$lang->tree->confirmRoot = "模块的所属{$lang->productCommon}修改，会关联修改该模块下的{$lang->SRCommon}、Bug、用例的所属{$lang->productCommon}，以及{$lang->executionCommon}和{$lang->productCommon}的关联关系。该操作比较危险，请谨慎操作。是否确认修改？";
+$lang->tree->confirmRoot4Doc = "修改所属文档库，会同时修改该分类下文档的关联关系。该操作比较危险，请谨慎操作。是否确认修改？";
+$lang->tree->noSubmodule = "当前模块下没有可复制的子模块！";
+$lang->tree->successSave = '成功保存';
+$lang->tree->successFixed = '成功修正数据！';
+$lang->tree->repeatName = '模块名“%s”已经存在！';
+$lang->tree->shouldNotBlank = '模块名不能为空格！';
$lang->tree->module = '模块';
$lang->tree->name = '模块名称';
diff --git a/module/tree/lang/zh-tw.php b/module/tree/lang/zh-tw.php
old mode 100644
new mode 100755
From 572021a1bd153aa13f359bf81f6912f64218d6a7 Mon Sep 17 00:00:00 2001
From: lanzongjun
Date: Tue, 16 Aug 2022 13:06:58 +0800
Subject: [PATCH 074/106] * fix params
---
module/project/control.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/module/project/control.php b/module/project/control.php
index 0a4618896f..fd90e7168d 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -150,7 +150,7 @@ class project extends control
->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->projects)->fi()
->beginIF(trim($data->name))->andWhere('name')->like("%$data->name%")->fi()
->fetchPairs();
- $projects = $this->project->getPairsByModel('undifined', 0, '', array_keys($projectPairs));
+ $projects = $this->project->getPairsByModel('', 0, '', array_keys($projectPairs));
$html = empty($projects) ? "