diff --git a/module/product/lang/de.php b/module/product/lang/de.php index 14a09e18b9..ea8801bc53 100644 --- a/module/product/lang/de.php +++ b/module/product/lang/de.php @@ -40,7 +40,8 @@ $lang->product->plans = 'Plan'; $lang->product->releases = 'Release'; $lang->product->docs = 'Dok'; $lang->product->bugs = 'Verknüpfte Bugs'; -$lang->product->projects = "Verknüpfte {$lang->executionCommon}"; +$lang->product->projects = "Linked Project"; +$lang->product->executions = "Verknüpfte {$lang->execution->common}"; $lang->product->cases = 'Fälle'; $lang->product->builds = 'Builds'; $lang->product->roadmap = 'Roadmap'; diff --git a/module/product/lang/en.php b/module/product/lang/en.php index c1b5cbf640..67441e0d7b 100644 --- a/module/product/lang/en.php +++ b/module/product/lang/en.php @@ -44,7 +44,8 @@ $lang->product->plans = 'Plans'; $lang->product->releases = 'Releases'; $lang->product->docs = 'Doc'; $lang->product->bugs = 'Linked Bug'; -$lang->product->projects = "Linked {$lang->executionCommon}"; +$lang->product->projects = "Linked Project"; +$lang->product->executions = "Linked {$lang->execution->common}"; $lang->product->cases = 'Case'; $lang->product->builds = 'Build'; $lang->product->roadmap = "{$lang->productCommon} Roadmap"; diff --git a/module/product/lang/fr.php b/module/product/lang/fr.php index 64867c1d22..cdf65b8f16 100644 --- a/module/product/lang/fr.php +++ b/module/product/lang/fr.php @@ -40,7 +40,8 @@ $lang->product->plans = 'Plans'; $lang->product->releases = 'Releases'; $lang->product->docs = 'Doc'; $lang->product->bugs = 'Bug Liés'; -$lang->product->projects = "{$lang->executionCommon}s Liés"; +$lang->product->projects = "Linked Project"; +$lang->product->executions = "{$lang->execution->common}s Liés"; $lang->product->cases = 'CasTests'; $lang->product->builds = 'Build'; $lang->product->roadmap = "Roadmap {$lang->productCommon}"; diff --git a/module/product/lang/vi.php b/module/product/lang/vi.php index 3e83f939df..9dade7a34d 100644 --- a/module/product/lang/vi.php +++ b/module/product/lang/vi.php @@ -40,7 +40,8 @@ $lang->product->plans = 'Kế hoạch'; $lang->product->releases = 'Phát hành'; $lang->product->docs = 'Tài liệu'; $lang->product->bugs = 'Bug liên kết'; -$lang->product->projects = "{$lang->executionCommon} liên kết"; +$lang->product->projects = "Linked Project"; +$lang->product->executions = "{$lang->execution->common} liên kết"; $lang->product->cases = 'Tình huống'; $lang->product->builds = 'Bản dựng'; $lang->product->roadmap = "Lộ trình {$lang->productCommon}"; diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php index ba563352fb..d4d4733016 100644 --- a/module/product/lang/zh-cn.php +++ b/module/product/lang/zh-cn.php @@ -44,7 +44,8 @@ $lang->product->plans = "计划数"; $lang->product->releases = '发布数'; $lang->product->docs = '文档数'; $lang->product->bugs = '相关Bug'; -$lang->product->projects = "关联{$lang->executionCommon}数"; +$lang->product->projects = "关联项目数"; +$lang->product->executions = "关联{$lang->execution->common}数"; $lang->product->cases = '用例数'; $lang->product->builds = '版本数'; $lang->product->roadmap = "{$lang->productCommon}路线图"; diff --git a/module/product/model.php b/module/product/model.php index d5d1d6aecf..d8c9a2c165 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -1257,16 +1257,25 @@ class productModel extends model ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id') ->where('t2.deleted')->eq(0) ->andWhere('t1.product')->eq($productID) + ->andWhere('t2.type')->eq('project') ->fetch(); - $product->stories = $stories; - $product->plans = $plans ? $plans->count : 0; - $product->releases = $releases ? $releases->count : 0; - $product->builds = $builds ? $builds->count : 0; - $product->cases = $cases ? $cases->count : 0; - $product->projects = $projects ? $projects->count : 0; - $product->bugs = $bugs ? $bugs->count : 0; - $product->docs = $docs ? $docs->count : 0; + $executions = $this->dao->select('count("t1.*") AS count')->from(TABLE_PROJECTPRODUCT)->alias('t1') + ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id') + ->where('t2.deleted')->eq(0) + ->andWhere('t1.product')->eq($productID) + ->andWhere('t2.type')->in('sprint,stage') + ->fetch(); + + $product->stories = $stories; + $product->plans = $plans ? $plans->count : 0; + $product->releases = $releases ? $releases->count : 0; + $product->builds = $builds ? $builds->count : 0; + $product->cases = $cases ? $cases->count : 0; + $product->projects = $projects ? $projects->count : 0; + $product->executions = $executions ? $executions->count : 0; + $product->bugs = $bugs ? $bugs->count : 0; + $product->docs = $docs ? $docs->count : 0; return $product; } diff --git a/module/product/view/view.html.php b/module/product/view/view.html.php index 1d9c4b9207..51c210b822 100644 --- a/module/product/view/view.html.php +++ b/module/product/view/view.html.php @@ -114,8 +114,8 @@