Merge branch 'sprint/master_zhouxudong_18270' into 'master'

Sprint/master zhouxudong 18270

See merge request easycorp/zentaopms!2654
This commit is contained in:
孙广明
2022-03-31 03:08:33 +00:00
4 changed files with 5 additions and 26 deletions
-7
View File
@@ -2561,13 +2561,6 @@ class execution extends control
if(!empty($_POST))
{
/* Get executionType and determine whether a product is linked with the stage. */
$executionType = $this->dao->findById($executionID)->from(TABLE_EXECUTION)->fetch('type');
if($executionType == 'stage')
{
if(!isset($_POST['products'])) return print(js::alert($this->lang->execution->noLinkProduct) . js::locate($this->createLink('execution', 'manageProducts', "executionID=$executionID&from=$from")));
}
$oldProducts = $this->product->getProducts($executionID);
if($from == 'buildCreate' && $this->session->buildCreate) $browseExecutionLink = $this->session->buildCreate;