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

Merge branch '18.x' into 18.8.1

Browse Source
This commit is contained in:
tanghucheng
2023-10-17 03:45:57 -04:00
parent 02080b8bcb 517418441c
commit 558517a538
504 changed files with 5640 additions and 4276 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+2 -2
View File
@@ -3432,7 +3432,7 @@ class execution extends control
$object = $this->project->getByID($objectID, 'project,sprint,stage,kanban');
$products = $this->product->getProducts($objectID);
$queryID = ($browseType == 'bySearch') ? (int)$param : 0;
$browseLink = $this->session->executionStoryList;
$browseLink = $this->createLink('execution', 'story', "executionID=$objectID");
if($this->app->tab == 'project' and $object->multiple and !$browseLink) $browseLink = $this->createLink('projectstory', 'story', "objectID=$objectID&productID=0&branch=0&browseType=&param=0&storyType=$storyType");
if($object->type == 'kanban' && !$object->hasProduct) $this->lang->productCommon = $this->lang->project->common;
@@ -4108,7 +4108,7 @@ class execution extends control
$this->view->productID = $productID;
$this->view->pager = $pager;
$this->view->orderBy = $orderBy;
$this->view->users = $this->loadModel('user')->getPairs('noletter', '', 0, array_unique(helper::arrayColumn($executionStats, 'PM')));
$this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->view->projects = array('') + $this->project->getPairsByProgram();
$this->view->status = $status;
$this->view->from = $from;