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

Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3

Browse Source
This commit is contained in:
hufangzhou
2021-04-27 11:35:38 +08:00
parent 6c14bd8916 9d88236bfd
commit 83762f4350
7 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/product/lang/de.php
+2 -1
View File
@@ -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';
module/product/lang/en.php
+2 -1
View File
@@ -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";
module/product/lang/fr.php
+2 -1
View File
@@ -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}";
module/product/lang/vi.php
+2 -1
View File
@@ -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}";
module/product/lang/zh-cn.php
+2 -1
View File
@@ -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}路线图";
module/product/model.php
+17 -8
View File
@@ -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;
}
module/product/view/view.html.php
+8 -4
View File
@@ -114,8 +114,8 @@
<tr>
<th><?php echo $lang->story->statusList['changed'] . $space . $lang->story->common;?></th>
<td><strong><?php echo $product->stories['changed']?></strong></td>
<th><?php echo $lang->product->projects?></th>
<td><strong><?php echo $product->projects?></strong></td>
<th><?php echo $lang->product->releases?></th>
<td><strong><?php echo $product->releases?></strong></td>
<th><?php echo $lang->product->cases?></th>
<td><strong><?php echo $product->cases?></strong></td>
</tr>
@@ -130,8 +130,12 @@
<tr>
<th><?php echo $lang->story->statusList['closed'] . $space . $lang->story->common;?></th>
<td><strong><?php echo $product->stories['closed']?></strong></td>
<th><?php echo $lang->product->releases?></th>
<td><strong><?php echo $product->releases?></strong></td>
<?php if($config->systemMode == 'new'):?>
<th><?php echo $lang->product->projects?></th>
<td><strong><?php echo $product->projects?></strong></td>
<?php endif;?>
<th><?php echo $lang->product->executions?></th>
<td><strong><?php echo $product->executions?></strong></td>
</tr>
</tbody>
</table>