diff --git a/module/tree/control.php b/module/tree/control.php index 214b4c6bdd..9056f04181 100644 --- a/module/tree/control.php +++ b/module/tree/control.php @@ -398,6 +398,7 @@ class tree extends control $confirmLang = $this->lang->tree->confirmDelete; if($module->type == 'line') $confirmLang = $this->lang->tree->confirmDeleteLine; if($module->type == 'host') $confirmLang = $this->lang->tree->confirmDeleteHost; + if($module->type == 'feedback') $confirmLang = $this->lang->tree->confirmDelCategory; die(js::confirm($confirmLang, $this->createLink('tree', 'delete', "rootID=$rootID&moduleID=$moduleID&confirm=yes"))); } else diff --git a/module/tree/lang/de.php b/module/tree/lang/de.php index 992bb73ca6..44d1c984a0 100644 --- a/module/tree/lang/de.php +++ b/module/tree/lang/de.php @@ -37,6 +37,7 @@ $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->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?"; @@ -57,6 +58,8 @@ $lang->tree->parent = 'Übergeordnet'; $lang->tree->parentCate = 'Parent Category'; $lang->tree->child = 'Untergeordnet'; $lang->tree->subCategory = 'SubCategory'; +$lang->tree->editCategory = 'Kategorie bearbeiten'; +$lang->tree->delCategory = 'Kategorie löschen'; $lang->tree->lineChild = "Child {$lang->productCommon} Line"; $lang->tree->owner = 'Besitzer'; $lang->tree->order = 'Reihenfolge'; diff --git a/module/tree/lang/en.php b/module/tree/lang/en.php index ea5bae5d3e..504aeb7b7a 100644 --- a/module/tree/lang/en.php +++ b/module/tree/lang/en.php @@ -37,6 +37,7 @@ $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->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?"; @@ -57,6 +58,8 @@ $lang->tree->parent = 'Parent Module'; $lang->tree->parentCate = 'Parent Category'; $lang->tree->child = 'Children'; $lang->tree->subCategory = 'SubCategory'; +$lang->tree->editCategory = 'Edit Category'; +$lang->tree->delCategory = 'Delete Category'; $lang->tree->lineChild = "Child {$lang->productCommon} Line"; $lang->tree->owner = 'Owner'; $lang->tree->order = 'Order'; diff --git a/module/tree/lang/fr.php b/module/tree/lang/fr.php index 28ce3650c6..079ba1a056 100644 --- a/module/tree/lang/fr.php +++ b/module/tree/lang/fr.php @@ -37,6 +37,7 @@ $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->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 ?"; @@ -57,6 +58,8 @@ $lang->tree->parent = 'Module Parent'; $lang->tree->parentCate = 'Catégorie Parente'; $lang->tree->child = 'Enfants'; $lang->tree->subCategory = 'SubCategory'; +$lang->tree->editCategory = 'Modifier la catégorie'; +$lang->tree->delCategory = 'Supprimer la catégorie'; $lang->tree->lineChild = 'Sous-Ligne Produit'; $lang->tree->owner = 'Propriétaire'; $lang->tree->order = 'Ordre'; diff --git a/module/tree/lang/vi.php b/module/tree/lang/vi.php index e654d4fa27..966243e7b1 100644 --- a/module/tree/lang/vi.php +++ b/module/tree/lang/vi.php @@ -37,6 +37,7 @@ $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->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ó?"; @@ -57,6 +58,8 @@ $lang->tree->parent = 'Module mẹ'; $lang->tree->parentCate = 'Danh mục mẹ'; $lang->tree->child = 'Con'; $lang->tree->subCategory = 'SubCategory'; +$lang->tree->editCategory = 'Sửa phân loại'; +$lang->tree->delCategory = 'Xoá phân loại'; $lang->tree->lineChild = "Dòng {$lang->productCommon} con"; $lang->tree->owner = 'Sở hữu'; $lang->tree->order = 'Sắp xếp'; diff --git a/module/tree/lang/zh-cn.php b/module/tree/lang/zh-cn.php index 0e9f885d1e..45e6fee09a 100644 --- a/module/tree/lang/zh-cn.php +++ b/module/tree/lang/zh-cn.php @@ -37,6 +37,7 @@ $lang->tree->dragAndSort = "拖放排序"; $lang->tree->sort = "排序"; $lang->tree->addChild = "增加子模块"; $lang->tree->confirmDelete = '该模块及其子模块都会被删除,您确定删除吗?'; +$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 = "修改所属文档库,会同时修改该分类下文档的关联关系。该操作比较危险,请谨慎操作。是否确认修改?"; @@ -57,6 +58,8 @@ $lang->tree->parent = '上级模块'; $lang->tree->parentCate = '上级分类'; $lang->tree->child = '子模块'; $lang->tree->subCategory = '子分类'; +$lang->tree->editCategory = '编辑分类'; +$lang->tree->delCategory = '删除分类'; $lang->tree->lineChild = "子{$lang->productCommon}线"; $lang->tree->owner = '负责人'; $lang->tree->order = '排序'; diff --git a/module/tree/lang/zh-tw.php b/module/tree/lang/zh-tw.php index 7fa68b911a..bd032a8ec5 100644 --- a/module/tree/lang/zh-tw.php +++ b/module/tree/lang/zh-tw.php @@ -37,6 +37,7 @@ $lang->tree->dragAndSort = "拖放排序"; $lang->tree->sort = "排序"; $lang->tree->addChild = "增加子模組"; $lang->tree->confirmDelete = '該模組及其子模組都會被刪除,您確定刪除嗎?'; +$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 = "修改所屬文檔庫,會同時修改該分類下文檔的關聯關係。該操作比較危險,請謹慎操作。是否確認修改?"; @@ -57,6 +58,8 @@ $lang->tree->parent = '上級模組'; $lang->tree->parentCate = '上級分類'; $lang->tree->child = '子模組'; $lang->tree->subCategory = '子分類'; +$lang->tree->editCategory = '編輯分類'; +$lang->tree->delCategory = '删除分類'; $lang->tree->lineChild = "子{$lang->productCommon}綫"; $lang->tree->owner = '負責人'; $lang->tree->order = '排序'; diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php index 31b4be88d6..84dcf40d6d 100644 --- a/module/tree/view/browse.html.php +++ b/module/tree/view/browse.html.php @@ -211,13 +211,13 @@ $(function() edit: { linkTemplate: '', - title: 'doc->editType : $lang->tree->edit ?>', + title: 'doc->editType : ($viewType == 'feedback' ? $lang->tree->editCategory : $lang->tree->edit);?>', template: '' }, "delete": { linkTemplate: '', - title: 'doc->deleteType : $lang->tree->delete ?>', + title: 'doc->deleteType : ($viewType == 'feedback' ? $lang->tree->delCategory : $lang->tree->delete)?>', template: '' }, subModules: