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

Merge branch 'sprint/189_mayue_fixbug#22411' into 'master'

Browse Source 
* Fix bug #22411.

See merge request easycorp/zentaopms!3370
This commit is contained in:
孙广明
2022-05-12 08:53:13 +00:00
parent 57b96215b3 44783b57a5
commit 3e677efa79
2 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/model.php
+8 -17
View File
@@ -515,11 +515,7 @@ class projectModel extends model
}
elseif($module == 'story')
{
if($method == 'create')
{
$link = helper::createLink($module, $method);
}
elseif($method == 'change')
if($method == 'change' or $method == 'create')
{
$link = helper::createLink('projectstory', 'story', "projectID=%s");
}
@@ -528,26 +524,19 @@ class projectModel extends model
$link = helper::createLink('project', 'testcase', "projectID=%s");
}
}
elseif($module == 'testcase' and $method == 'create')
elseif($module == 'testcase')
{
if($method == 'create')
{
$link = helper::createLink($module, $method);
}
elseif($method == 'edit')
{
$link = helper::createLink('project', 'testcase', "projectID=%s");
}
$link = helper::createLink('project', 'testcase', "projectID=%s");
}
elseif($module == 'testtask')
{
if($method == 'create')
if($method == 'browseunits')
{
$link = helper::createLink($module, $method, "product=0&executionID=0&build=0&projectID=%s");
$link = helper::createLink('project', 'testcase', "projectID=%s");
}
else
{
$link = helper::createLink($module, 'browseunits');
$link = helper::createLink('project', 'testtask', "projectID=%s");
}
}
elseif($module == 'testreport')
@@ -2476,6 +2465,8 @@ class projectModel extends model
$this->lang->switcherMenu = $this->getSwitcher($objectID, $this->app->rawModule, $this->app->rawMethod);
$this->saveState($objectID, $this->project->getPairsByProgram());
common::setMenuVars('project', $objectID);
}
module/testtask/control.php
+1 -1
View File
@@ -165,7 +165,7 @@ class testtask extends control
$this->lang->waterfall->menu->qa['subMenu']->testtask['subModule'] = '';
}
$this->loadModel('project')->setMenu($this->session->project);
$this->loadModel('project')->setMenu($projectID);
$this->lang->modulePageNav = $this->product->select($this->products, $productID, 'testtask', 'browseUnits', "projectID=$projectID", '', 0, '', false);
}
else