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-22 11:47:44 +08:00
parent c7313cefd6 f9ec1f84fb
commit 28017454fa
24 changed files with 173 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/build/control.php
+26 -2
View File
@@ -40,14 +40,21 @@ class build extends control
if($this->app->openApp == 'project')
{
$model = $this->dao->select('model')->from(TABLE_PROJECT)->where('id')->eq($projectID)->fetch('model');
$this->lang->project->menu = $this->lang->$model->menu;
$this->lang->project->menuOrder = $this->lang->$model->menuOrder;
commonModel::setMenuVars('project', $projectID);
$executions = $this->execution->getPairs($projectID);
$executionID = isset($executions[$this->session->executionID]) ? $this->session->executionID : key($executions);
$this->session->set('executionID', 0);
$this->session->set('PRJ', $projectID);
}
elseif($this->app->openApp == 'execution')
{
$executions = $this->execution->getPairs($execution->project);
$this->execution->setMenu($executionID);
$this->session->set('project', $execution->project);
}
$productGroups = $this->execution->getProducts($executionID);
@@ -103,6 +110,14 @@ class build extends control
$this->loadModel('product');
$build = $this->build->getById((int)$buildID);
if($this->app->openApp == 'project')
{
$model = $this->dao->select('model')->from(TABLE_PROJECT)->where('id')->eq($build->project)->fetch('model');
$this->lang->project->menu = $this->lang->$model->menu;
$this->lang->project->menuOrder = $this->lang->$model->menuOrder;
commonModel::setMenuVars('project', $build->project);
}
/* Set menu. */
$this->execution->setMenu($this->execution->getPairs($build->project), $build->execution);
@@ -164,10 +179,19 @@ class build extends control
*/
public function view($buildID, $type = 'story', $link = 'false', $param = '', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 100, $pageID = 1)
{
$build = $this->build->getByID((int)$buildID, true);
if(!$build) die(js::error($this->lang->notFound) . js::locate('back'));
$this->session->PRJ = $build->project;
if($this->app->openApp == 'project')
{
$model = $this->dao->select('model')->from(TABLE_PROJECT)->where('id')->eq($build->project)->fetch('model');
$this->lang->project->menu = $this->lang->$model->menu;
$this->lang->project->menuOrder = $this->lang->$model->menuOrder;
commonModel::setMenuVars('project', $build->project);
}
/* Set session and load modules. */
if($type == 'story')$this->session->set('storyList', $this->app->getURI(true));
if($type == 'bug') $this->session->set('bugList', $this->app->getURI(true));
@@ -199,7 +223,7 @@ class build extends control
foreach($stages as $storyID => $stage)$stories[$storyID]->stage = $stage;
/* Set menu. */
commonModel::setAppObjectID('execution', $build->execution);
commonModel::setMenuVars('execution', $build->execution);
$executions = $this->loadModel('execution')->getPairs($this->session->PRJ, 'all', 'empty');
$this->view->title = "BUILD #$build->id $build->name - " . $executions[$build->execution];
@@ -550,7 +574,7 @@ class build extends control
if($browseType == 'bySearch')
{
$allBugs = $this->bug->getBySearch($build->product, $build->branch, $queryID, 'id_desc', $build->bugs, $pager);
$allBugs = $this->bug->getBySearch($build->product, $build->branch, $queryID, 'id_desc', $build->bugs, $pager, $build->project);
}
else
{