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

* Fix details.

Browse Source
This commit is contained in:
sgm0422
2021-01-02 15:08:54 +08:00
parent 28c5ce17b9
commit 09ccc2739d
4 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/base/helper.class.php
+1 -1
View File
@@ -172,7 +172,7 @@ class baseHelper
if(!$PRJID || $removePRJ) return $link;
$isProject = (zget($lang->navGroup, $moduleName) == 'project');
if(!$isProject) return $link;
if(!$isProject and $moduleName != 'program') return $link;
$link .= strpos($link, '?') === false ? "?PRJ=$PRJID" : "&PRJ=$PRJID";
return $link;
module/common/lang/menuOrder.php
+6 -6
View File
@@ -16,9 +16,9 @@ $lang->waterfall->menuOrder[20] = 'projectstory';
$lang->waterfall->menuOrder[25] = 'design';
$lang->waterfall->menuOrder[30] = 'ci';
$lang->waterfall->menuOrder[35] = 'qa';
$lang->waterfall->menuOrder[40] = 'projectbuild';
$lang->waterfall->menuOrder[45] = 'projectrelease';
$lang->waterfall->menuOrder[50] = 'doc';
$lang->waterfall->menuOrder[40] = 'doc';
$lang->waterfall->menuOrder[45] = 'projectbuild';
$lang->waterfall->menuOrder[50] = 'projectrelease';
$lang->waterfall->menuOrder[55] = 'weekly';
$lang->waterfall->menuOrder[60] = 'other';
$lang->waterfall->menuOrder[65] = 'projectsetting';
@@ -28,9 +28,9 @@ $lang->scrum->menuOrder[10] = 'project';
$lang->scrum->menuOrder[15] = 'projectstory';
$lang->scrum->menuOrder[20] = 'qa';
$lang->scrum->menuOrder[25] = 'ci';
$lang->scrum->menuOrder[30] = 'projectbuild';
$lang->scrum->menuOrder[35] = 'projectrelease';
$lang->scrum->menuOrder[40] = 'doc';
$lang->scrum->menuOrder[30] = 'doc';
$lang->scrum->menuOrder[35] = 'projectbuild';
$lang->scrum->menuOrder[40] = 'projectrelease';
$lang->scrum->menuOrder[45] = 'other';
$lang->scrum->menuOrder[50] = 'projectsetting';
module/common/lang/zh-cn.php
+2 -2
View File
@@ -351,7 +351,7 @@ $lang->project->subMenu->qa->bug = 'Bug|project|bug|projectID=%s';
$lang->project->subMenu->qa->build = array('link' => '版本|project|build|projectID=%s', 'subModule' => 'build');
$lang->project->subMenu->qa->testtask = array('link' => '测试单|project|testtask|projectID=%s', 'subModule' => 'testreport,testtask');
$lang->project->dividerMenu = ',programplan,projectbuild,story,team,product,other,';
$lang->project->dividerMenu = ',project,doc,programplan,projectbuild,story,team,product,other,';
$lang->task = new stdclass();
$lang->build = new stdclass();
@@ -912,7 +912,7 @@ $lang->menu->waterfall->ci = '代码|repo|browse|';
$lang->menu->waterfall->qa = array('link' => '测试|bug|browse|product={PRODUCT}', 'subModule' => ',testcase,testtask,testsuite,caselib,');
$lang->menu->waterfall->projectrelease = array('link' => '发布|projectrelease|browse');
$lang->menu->waterfall->projectbuild = array('link' => '版本|projectbuild|browse|project={PROJECT}');
$lang->menu->waterfall->other = array('link' => '其他|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk,stakeholder');
$lang->menu->waterfall->other = array('link' => '其他|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk,stakeholder,nc');
$lang->menu->waterfall->projectsetting = array('link' => '设置|project|setting', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'workestimation,durationestimation,budget,pssp');
$lang->waterfall = new stdclass();
module/common/model.php
+1 -3
View File
@@ -2406,7 +2406,6 @@ EOD;
if($program->model == 'scrum')
{
$lang->menuOrder = $lang->scrum->menuOrder;
$lang->project->dividerMenu = ',project,projectbuild,story,team,product,other,';
/* The scrum project temporarily hides the trace matrix. */
unset($lang->projectstory->menu->track);
@@ -2415,8 +2414,7 @@ EOD;
if($program->model == 'waterfall')
{
$lang->project->dividerMenu = ',programplan,projectbuild,story,team,product,other,';
$lang->project->dividerMenu = str_replace(',project,', ',', $lang->project->dividerMenu);
$lang->release->menu = new stdclass();
$lang->menugroup->release = '';
$lang->menuOrder = $lang->waterfall->menuOrder;