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

* Deal with more link issues in project blocks.

Browse Source
This commit is contained in:
tianshujie98
2021-03-26 12:16:56 +08:00
parent f0738d72b4
commit a4c865e7fd
13 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/control.php
+3 -3
View File
@@ -253,13 +253,13 @@ class block extends control
/* The list assigned to me jumps to the work page when click more button. */
$block->moreLink = $this->createLink($moduleName, $method, $vars);
if($moduleName = 'my' and strpos('task|story|requirement|bug|testcase|testtask|issue|risk', $method))
if($moduleName == 'my' and strpos('task|story|requirement|bug|testcase|testtask|issue|risk', $method))
{
$block->moreLink = $this->createLink($moduleName, 'work', 'mode=' . $method . '&' . $vars);
}
elseif($moduleName = 'project')
elseif($moduleName == 'project' and $method == 'dynamic')
{
$block->moreLink = $this->createLink('project', 'dynamic', "projectID={$this->session->project}");
$block->moreLink = $this->createLink('project', 'dynamic', "projectID=$projectID&type=all");
}
}
elseif($block->block == 'dynamic')
module/block/lang/de.php
+3 -3
View File
@@ -512,11 +512,11 @@ $lang->block->modules['project']->moreLinkList->cmmireport = 'weekly|index|'
$lang->block->modules['project']->moreLinkList->cmmiestimate = 'workestimation|index|';
$lang->block->modules['project']->moreLinkList->cmmiissue = 'issue|browse|';
$lang->block->modules['project']->moreLinkList->cmmirisk = 'risk|browse|';
$lang->block->modules['project']->moreLinkList->scrumlist = 'project|all|';
$lang->block->modules['project']->moreLinkList->scrumlist = 'project|execution|';
$lang->block->modules['project']->moreLinkList->scrumtest = 'testtask|browse|';
$lang->block->modules['project']->moreLinkList->scrumproduct = 'product|all|';
$lang->block->modules['project']->moreLinkList->sprint = 'project|all|';
$lang->block->modules['project']->moreLinkList->projectdynamic = 'company|dynamic|';
$lang->block->modules['project']->moreLinkList->sprint = 'project|execution|';
$lang->block->modules['project']->moreLinkList->projectdynamic = 'project|dynamic|';
$lang->block->modules['product']->moreLinkList = new stdclass();
$lang->block->modules['product']->moreLinkList->list = 'product|all|';
module/block/lang/en.php
+3 -3
View File
@@ -512,11 +512,11 @@ $lang->block->modules['project']->moreLinkList->cmmireport = 'weekly|index|'
$lang->block->modules['project']->moreLinkList->cmmiestimate = 'workestimation|index|';
$lang->block->modules['project']->moreLinkList->cmmiissue = 'issue|browse|';
$lang->block->modules['project']->moreLinkList->cmmirisk = 'risk|browse|';
$lang->block->modules['project']->moreLinkList->scrumlist = 'project|all|';
$lang->block->modules['project']->moreLinkList->scrumlist = 'project|execution|';
$lang->block->modules['project']->moreLinkList->scrumtest = 'testtask|browse|';
$lang->block->modules['project']->moreLinkList->scrumproduct = 'product|all|';
$lang->block->modules['project']->moreLinkList->sprint = 'project|all|';
$lang->block->modules['project']->moreLinkList->projectdynamic = 'company|dynamic|';
$lang->block->modules['project']->moreLinkList->sprint = 'project|execution|';
$lang->block->modules['project']->moreLinkList->projectdynamic = 'project|dynamic|';
$lang->block->modules['product']->moreLinkList = new stdclass();
$lang->block->modules['product']->moreLinkList->list = 'product|all|';
module/block/lang/fr.php
+3 -3
View File
@@ -512,11 +512,11 @@ $lang->block->modules['project']->moreLinkList->cmmireport = 'weekly|index|'
$lang->block->modules['project']->moreLinkList->cmmiestimate = 'workestimation|index|';
$lang->block->modules['project']->moreLinkList->cmmiissue = 'issue|browse|';
$lang->block->modules['project']->moreLinkList->cmmirisk = 'risk|browse|';
$lang->block->modules['project']->moreLinkList->scrumlist = 'project|all|';
$lang->block->modules['project']->moreLinkList->scrumlist = 'project|execution|';
$lang->block->modules['project']->moreLinkList->scrumtest = 'testtask|browse|';
$lang->block->modules['project']->moreLinkList->scrumproduct = 'product|all|';
$lang->block->modules['project']->moreLinkList->sprint = 'project|all|';
$lang->block->modules['project']->moreLinkList->projectdynamic = 'company|dynamic|';
$lang->block->modules['project']->moreLinkList->sprint = 'project|execution|';
$lang->block->modules['project']->moreLinkList->projectdynamic = 'project|dynamic|';
$lang->block->modules['product']->moreLinkList = new stdclass();
$lang->block->modules['product']->moreLinkList->list = 'product|all|';
module/block/lang/vi.php
+3 -3
View File
@@ -512,11 +512,11 @@ $lang->block->modules['project']->moreLinkList->cmmireport = 'weekly|index|'
$lang->block->modules['project']->moreLinkList->cmmiestimate = 'workestimation|index|';
$lang->block->modules['project']->moreLinkList->cmmiissue = 'issue|browse|';
$lang->block->modules['project']->moreLinkList->cmmirisk = 'risk|browse|';
$lang->block->modules['project']->moreLinkList->scrumlist = 'project|all|';
$lang->block->modules['project']->moreLinkList->scrumlist = 'project|execution|';
$lang->block->modules['project']->moreLinkList->scrumtest = 'testtask|browse|';
$lang->block->modules['project']->moreLinkList->scrumproduct = 'product|all|';
$lang->block->modules['project']->moreLinkList->sprint = 'project|all|';
$lang->block->modules['project']->moreLinkList->projectdynamic = 'company|dynamic|';
$lang->block->modules['project']->moreLinkList->sprint = 'project|execution|';
$lang->block->modules['project']->moreLinkList->projectdynamic = 'project|dynamic|';
$lang->block->modules['product']->moreLinkList = new stdclass();
$lang->block->modules['product']->moreLinkList->list = 'product|all|';
module/block/lang/zh-cn.php
+3 -3
View File
@@ -512,11 +512,11 @@ $lang->block->modules['project']->moreLinkList->cmmireport = 'weekly|index|'
$lang->block->modules['project']->moreLinkList->cmmiestimate = 'workestimation|index|';
$lang->block->modules['project']->moreLinkList->cmmiissue = 'issue|browse|';
$lang->block->modules['project']->moreLinkList->cmmirisk = 'risk|browse|';
$lang->block->modules['project']->moreLinkList->scrumlist = 'project|all|';
$lang->block->modules['project']->moreLinkList->scrumlist = 'project|execution|';
$lang->block->modules['project']->moreLinkList->scrumtest = 'testtask|browse|';
$lang->block->modules['project']->moreLinkList->scrumproduct = 'product|all|';
$lang->block->modules['project']->moreLinkList->sprint = 'project|all|';
$lang->block->modules['project']->moreLinkList->projectdynamic = 'company|dynamic|';
$lang->block->modules['project']->moreLinkList->sprint = 'project|execution|';
$lang->block->modules['project']->moreLinkList->projectdynamic = 'project|dynamic|';
$lang->block->modules['product']->moreLinkList = new stdclass();
$lang->block->modules['product']->moreLinkList->list = 'product|all|';
module/block/view/scrumtestblock.html.php
+1 -1
View File
@@ -22,7 +22,7 @@
<th class='text-left'><?php echo $lang->testtask->product;?></th>
<?php endif;?>
<?php if($longBlock):?>
<th class='text-left'><?php echo $lang->testtask->execution?></th>
<th class='text-left'><?php echo $lang->testtask->project?></th>
<?php endif;?>
<th class='text-left'><?php echo $lang->testtask->build;?></th>
<th class='w-date'><?php echo $lang->testtask->status;?></th>
module/project/view/index.html.php
+1 -1
View File
@@ -10,5 +10,5 @@
*/
?>
<?php include '../../common/view/header.html.php';?>
<?php echo $this->fetch('block', 'dashboard', "module=project&type={$project->model}");?>
<?php echo $this->fetch('block', 'dashboard', "module=project&type={$project->model}&projectID={$project->id}");?>
<?php include '../../common/view/footer.html.php';?>
module/testtask/lang/de.php
+1
View File
@@ -57,6 +57,7 @@ $lang->testtask->expandAll = 'Aufklappen';
$lang->testtask->id = 'ID';
$lang->testtask->common = 'Testaufgabe';
$lang->testtask->product = $lang->productCommon;
$lang->testtask->project = 'Project';
$lang->testtask->execution = $lang->executionCommon;
$lang->testtask->build = 'Build';
$lang->testtask->owner = 'Besitzer';
module/testtask/lang/en.php
+1
View File
@@ -57,6 +57,7 @@ $lang->testtask->expandAll = 'Expand';
$lang->testtask->id = 'ID';
$lang->testtask->common = 'Request';
$lang->testtask->product = $lang->productCommon;
$lang->testtask->project = 'Project';
$lang->testtask->execution = $lang->executionCommon;
$lang->testtask->build = 'Build';
$lang->testtask->owner = 'Owner';
module/testtask/lang/fr.php
+1
View File
@@ -57,6 +57,7 @@ $lang->testtask->expandAll = 'Déplier';
$lang->testtask->id = 'ID';
$lang->testtask->common = 'Recette';
$lang->testtask->product = $lang->productCommon;
$lang->testtask->project = 'Project';
$lang->testtask->execution = $lang->executionCommon;
$lang->testtask->build = 'Build';
$lang->testtask->owner = 'Owner';
module/testtask/lang/vi.php
+1
View File
@@ -57,6 +57,7 @@ $lang->testtask->expandAll = 'Mở ra';
$lang->testtask->id = 'ID';
$lang->testtask->common = 'Yêu cầu';
$lang->testtask->product = $lang->productCommon;
$lang->testtask->project = 'Project';
$lang->testtask->execution = $lang->executionCommon;
$lang->testtask->build = 'Bản dựng';
$lang->testtask->owner = 'Sở hữu';
module/testtask/lang/zh-cn.php
+1
View File
@@ -57,6 +57,7 @@ $lang->testtask->expandAll = '全部展开';
$lang->testtask->id = '编号';
$lang->testtask->common = '测试单';
$lang->testtask->product = '所属' . $lang->productCommon;
$lang->testtask->project = '所属项目';
$lang->testtask->execution = '所属' . $lang->executionCommon;
$lang->testtask->build = '版本';
$lang->testtask->owner = '负责人';