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

Merge branch 'sprint_59473' into 'master'

Browse Source 
Sprint 59473

See merge request easycorp/zentaopms!4362
This commit is contained in:
孙广明
2022-07-06 01:13:32 +00:00
parent 6f1521407c e5ed8133b1
commit 6fe5ef5a23
5 changed files with 78 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+19 -1
View File
@@ -1589,7 +1589,9 @@ class execution extends control
if(!empty($this->config->user->moreLink)) $this->config->moreLinks["RD"] = $this->config->user->moreLink;
$this->loadModel('product');
$allProducts = $this->config->systemMode == 'classic' ? $this->product->getPairs('noclosed') : $this->product->getProductPairsByProject($projectID, 'noclosed');
$allProducts = $this->config->systemMode == 'classic' ? $this->product->getPairs('noclosed') : $this->product->getProductPairsByProject($projectID, 'noclosed');
$copyProjects = $this->loadModel('project')->getPairsByProgram(isset($project->parent) ? $project->parent : '', 'noclosed', '', 'order_asc', '', isset($project->model) ? $project->model : '');
$copyProjectID = ($projectID == 0) ? key($copyProjects) : $projectID;
$this->view->title = (($this->app->tab == 'execution') and ($this->config->systemMode == 'new')) ? $this->lang->execution->createExec : $this->lang->execution->create;
$this->view->position[] = $this->view->title;
@@ -1604,6 +1606,8 @@ class execution extends control
$this->view->team = $team;
$this->view->teams = array(0 => '') + $this->execution->getCanCopyObjects((int)$projectID);
$this->view->allProjects = array(0 => '') + $this->project->getPairsByModel('all', 0, 'noclosed');
$this->view->copyProjects = $copyProjects;
$this->view->copyExecutions = array('' => '') + $this->execution->getList($copyProjectID);
$this->view->executionID = $executionID;
$this->view->productID = $productID;
$this->view->projectID = $projectID;
@@ -4037,4 +4041,18 @@ class execution extends control
echo json_encode($date);
}
}
/**
* Ajax get copy project executions.
*
* @param int $projectID
* @access public
* @return void
*/
public function ajaxGetCopyProjectExecutions($projectID = 0)
{
$executions = $this->execution->getList($projectID);
echo json_encode($executions);
}
}