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

* Fix bugs.

Browse Source
This commit is contained in:
Yagami
2021-03-18 14:48:05 +08:00
parent a8608c6973
commit 1d09fea4a4
3 changed files with 16 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+6 -5
View File
@@ -212,7 +212,7 @@ class executionModel extends model
*/
public function tree()
{
$products = $this->loadModel('product')->getPairs('nocode', $this->session->PRJ);
$products = $this->loadModel('product')->getPairs('nocode', 0);
$productGroup = $this->getProductGroupList();
$executionTree = "<ul class='tree tree-lines'>";
foreach($productGroup as $productID => $executions)
@@ -1709,10 +1709,10 @@ class executionModel extends model
*/
public function getTasks2Imported($toExecution, $branches)
{
$products = $this->getProducts($toExecution);
$products = $this->getProducts($toExecution);
if(empty($products)) return array();
$execution = $this->getById($toExecution);
$execution = $this->getById($toExecution);
$executions = $this->dao->select('t1.product, t1.project')->from(TABLE_PROJECTPRODUCT)->alias('t1')
->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.project=t2.id')
->where('t1.product')->in(array_keys($products))
@@ -1855,6 +1855,7 @@ class executionModel extends model
$bugToTasks = fixer::input('post')->get();
$bugs = $this->bug->getByList(array_keys($bugToTasks->import));
$projectID = $this->loadModel('execution')->getProjectID($executionID);
foreach($bugToTasks->import as $key => $value)
{
$bug = zget($bugs, $key, '');
@@ -1862,8 +1863,8 @@ class executionModel extends model
$task = new stdClass();
$task->bug = $bug;
$task->PRJ = $this->session->PRJ;
$task->execution = $executionID;
$task->project = $projectID;
$task->execution = $executionID;
$task->story = $bug->story;
$task->storyVersion = $bug->storyVersion;
$task->module = isset($modules[$bug->module]) ? $bug->module : 0;