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

Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3

Browse Source
This commit is contained in:
zhujinyong
2021-03-18 16:19:42 +08:00
parent 8749c2983d fdfa1e9acc
commit 4a3282ea5b
17 changed files with 67 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+4 -4
View File
@@ -475,7 +475,7 @@ class execution extends control
$toExecution = $execution->id;
$branches = $this->execution->getBranches($toExecution);
$tasks = $this->execution->getTasks2Imported($toExecution, $branches);
$executions = $this->execution->getsToImport(array_keys($tasks), $execution->type);
$executions = $this->execution->getToImport(array_keys($tasks), $execution->type);
unset($executions[$toExecution]);
unset($tasks[$toExecution]);
@@ -540,7 +540,7 @@ class execution extends control
$this->app->session->set('executionList', $uri);
$this->loadModel('bug');
$executions = $this->execution->getPairs($this->session->PRJ, 'all', 'nocode');
$executions = $this->execution->getPairs(0, 'all', 'nocode');
$this->execution->setMenu($executions, $executionID);
/* Load pager. */
@@ -1052,7 +1052,7 @@ class execution extends control
$this->view->orderBy = $orderBy;
$this->view->tasks = $productTasks;
$this->view->users = $this->loadModel('user')->getPairs('noclosed|noletter');
$this->view->products = $this->loadModel('product')->getPairs('', $this->session->PRJ);
$this->view->products = $this->loadModel('product')->getPairs('', 0);
$this->view->canBeChanged = common::canModify('execution', $execution); // Determines whether an object is editable.
$this->display();
@@ -2964,7 +2964,7 @@ class execution extends control
$this->view->cases = $cases;
$this->view->story = $story;
$this->view->users = $users;
$this->view->executions = $this->loadModel('execution')->getPairs($this->session->PRJ, 'all', 'nocode');
$this->view->executions = $this->loadModel('execution')->getPairs(0, 'all', 'nocode');
$this->view->actions = $this->loadModel('action')->getList('story', $storyID);
$this->view->modulePath = $modulePath;
$this->view->version = $version == 0 ? $story->version : $version;