This commit is contained in:
liugang
2022-10-17 11:04:52 +08:00
parent 3588c5b926
commit 3dc2ee8dd0
2 changed files with 7 additions and 3 deletions
+4 -1
View File
@@ -3297,6 +3297,9 @@ class execution extends control
$pager = new pager($recTotal, $recPerPage, $pageID);
$allStories = array_chunk($allStories, $pager->recPerPage);
$project = $object;
if(strpos('sprint,stage,kanban', $object->type) !== false) $project = $this->loadModel('project')->getByID($object->project);
/* Assign. */
$this->view->title = $object->name . $this->lang->colon . $this->lang->execution->linkStory;
$this->view->position[] = html::a($browseLink, $object->name);
@@ -3312,7 +3315,7 @@ class execution extends control
$this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->view->branchGroups = $branchGroups;
$this->view->browseLink = $browseLink;
$this->view->project = $this->loadModel('project')->getByID($object->project);
$this->view->project = $project;
$this->display();
}
+3 -2
View File
@@ -2254,8 +2254,9 @@ class executionModel extends model
}
$this->config->product->search['params']['status'] = array('operator' => '=', 'control' => 'select', 'values' => $this->lang->story->statusList);
$project = $this->loadModel('project')->getByID($execution->project);
if(empty($project->hasProduct))
$project = $execution;
if(strpos('sprint,stage,kanban', $execution->type) !== false) $project = $this->loadModel('project')->getByID($execution->project);
if(isset($project->hasProduct) && empty($project->hasProduct))
{
unset($this->config->product->search['fields']['product']);