Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'

* fix bug #22008

See merge request easycorp/zentaopms!3162
This commit is contained in:
王怡栋
2022-04-27 09:29:23 +00:00
+2 -2
View File
@@ -3587,7 +3587,7 @@ class execution extends control
if($execution->type == 'project')
{
$moduleName = 'projectstory';
$param = "projectID=$executionID";
$param = "projectID=$executionID&productID=$productID";
}
if($execution->type == 'kanban')
@@ -3596,7 +3596,7 @@ class execution extends control
$lang->executionCommon = $lang->execution->kanban;
include $this->app->getModulePath('', 'execution') . 'lang/' . $this->app->getClientLang() . '.php';
}
if($count != 0) echo js::alert(sprintf($this->lang->execution->haveDraft, $count)) . js::locate($this->createLink($moduleName, $execution->type == 'sprint' ? 'story' : 'kanban', $param));
if($count != 0) echo js::alert(sprintf($this->lang->execution->haveDraft, $count)) . js::locate($this->createLink($moduleName, in_array($execution->type, array('sprint','project')) ? 'story' : 'kanban', $param));
return print(js::locate(helper::createLink($moduleName, $fromMethod, $param)));
}