Merge branch 'zenops_66' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_66

This commit is contained in:
zhaoke
2023-03-24 14:28:26 +08:00
+2 -2
View File
@@ -139,7 +139,7 @@ class repo extends control
$this->app->loadLang('action');
if($this->app->tab == 'project')
if($this->app->tab == 'project' or $this->app->tab == 'execution')
{
$products = $this->loadModel('product')->getProductPairsByProject($objectID);
}
@@ -154,7 +154,7 @@ class repo extends control
$this->view->users = $this->loadModel('user')->getPairs('noletter|noempty|nodeleted|noclosed');
$this->view->products = $products;
$this->view->projects = $this->loadModel('product')->getProjectPairsByProductIDList(array_keys($products));
$this->view->relatedProjects = $this->app->tab == 'project' ? array($objectID) : array();
$this->view->relatedProjects = ($this->app->tab == 'project' or $this->app->tab == 'execution') ? array($objectID) : array();
$this->view->serviceHosts = $this->loadModel('gitlab')->getPairs();
$this->view->objectID = $objectID;