diff --git a/module/build/control.php b/module/build/control.php index 05027294d2..232507f060 100644 --- a/module/build/control.php +++ b/module/build/control.php @@ -143,6 +143,7 @@ class build extends control $this->view->products = $products; $this->view->users = $this->loadModel('user')->getPairs('noletter', $build->builder); $this->view->build = $build; + $this->view->testtask = $this->dao->select('id')->from(TABLE_TESTTASK)->where('build')->eq($build->id)->andWhere('deleted')->eq(0)->fetch('id'); $this->display(); } diff --git a/module/build/lang/de.php b/module/build/lang/de.php index 8d8f06a901..9f78f1ec64 100644 --- a/module/build/lang/de.php +++ b/module/build/lang/de.php @@ -49,7 +49,8 @@ $lang->build->noProduct = " Dieses {$lang->projectCo $lang->build->noBuild = 'Keine Builds. '; $lang->build->notice = new stdclass(); -$lang->build->notice->changeProduct = "The {$lang->productSRCommon} or Bug has been associated, and its product cannot be modified"; +$lang->build->notice->changeProduct = "The {$lang->productSRCommon}, bug, or the version of the submitted test order has been linked, and its {$lang->productCommon} cannot be modified"; +$lang->build->notice->changeProject = "The version of the submitted test order cannot be modified {$lang->projectCommon}"; $lang->build->finishStories = " %s {$lang->productSRCommon} sind abgeschlossen."; $lang->build->resolvedBugs = ' %s Bugs sind gelöst.'; diff --git a/module/build/lang/en.php b/module/build/lang/en.php index c0262d1970..ee121106d2 100644 --- a/module/build/lang/en.php +++ b/module/build/lang/en.php @@ -49,7 +49,8 @@ $lang->build->noProduct = " This {$lang->projectComm $lang->build->noBuild = 'No builds yet.'; $lang->build->notice = new stdclass(); -$lang->build->notice->changeProduct = "The {$lang->productSRCommon} or Bug has been associated, and its product cannot be modified"; +$lang->build->notice->changeProduct = "The {$lang->productSRCommon}, bug, or the version of the submitted test order has been linked, and its {$lang->productCommon} cannot be modified"; +$lang->build->notice->changeProject = "The version of the submitted test order cannot be modified {$lang->projectCommon}"; $lang->build->finishStories = " Finished {$lang->productSRCommon} %s"; $lang->build->resolvedBugs = ' Resolved Bug %s'; diff --git a/module/build/lang/fr.php b/module/build/lang/fr.php index 910ad5dcc7..99dbbd2bea 100644 --- a/module/build/lang/fr.php +++ b/module/build/lang/fr.php @@ -49,7 +49,8 @@ $lang->build->noProduct = " Ce {$lang->projectCommon $lang->build->noBuild = 'Aucun builds.'; $lang->build->notice = new stdclass(); -$lang->build->notice->changeProduct = "La {$lang->productSRCommon} ou le Bug a été associé et son product ne peut pas être modifié"; +$lang->build->notice->changeProduct = "The {$lang->productSRCommon}, bug, or the version of the submitted test order has been linked, and its {$lang->productCommon} cannot be modified"; +$lang->build->notice->changeProject = "The version of the submitted test order cannot be modified {$lang->projectCommon}"; $lang->build->finishStories = " {$lang->productSRCommon} Terminées %s"; $lang->build->resolvedBugs = ' Bugs Résolus %s'; diff --git a/module/build/lang/vi.php b/module/build/lang/vi.php index 4d4cde1ed0..d7b0c124f8 100644 --- a/module/build/lang/vi.php +++ b/module/build/lang/vi.php @@ -49,7 +49,8 @@ $lang->build->noProduct = " {$lang->projectCommon} n $lang->build->noBuild = 'Không có bản dựng nào'; $lang->build->notice = new stdclass(); -$lang->build->notice->changeProduct = "{$lang->productSRCommon} này hoặc Bug đã được kết hợp, và sản phẩm của nó không thể bị sửa đổi"; +$lang->build->notice->changeProduct = "The {$lang->productSRCommon}, bug, or the version of the submitted test order has been linked, and its {$lang->productCommon} cannot be modified"; +$lang->build->notice->changeProject = "The version of the submitted test order cannot be modified {$lang->projectCommon}"; $lang->build->finishStories = " {$lang->productSRCommon} đã kết thúc %s"; $lang->build->resolvedBugs = ' Bug đã giải quyết %s'; diff --git a/module/build/lang/zh-cn.php b/module/build/lang/zh-cn.php index 119f5302d8..2eb28597f9 100644 --- a/module/build/lang/zh-cn.php +++ b/module/build/lang/zh-cn.php @@ -49,7 +49,8 @@ $lang->build->noProduct = " 该{$lang->projectCommon $lang->build->noBuild = '暂时没有版本。'; $lang->build->notice = new stdclass(); -$lang->build->notice->changeProduct = "已经关联{$lang->productSRCommon}或Bug的版本,不能修改其所属产品"; +$lang->build->notice->changeProduct = "已经关联{$lang->productSRCommon}、Bug或提交测试单的版本,不能修改其所属{$lang->productCommon}"; +$lang->build->notice->changeProject = "提交测试单的版本,不能修改其所属{$lang->projectCommon}"; $lang->build->finishStories = " 本次共完成 %s 个{$lang->productSRCommon}"; $lang->build->resolvedBugs = ' 本次共解决 %s 个Bug'; diff --git a/module/build/view/edit.html.php b/module/build/view/edit.html.php index 44d77b4e40..a816c0981e 100644 --- a/module/build/view/edit.html.php +++ b/module/build/view/edit.html.php @@ -28,7 +28,7 @@