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

* Finish task #82075.

Browse Source
This commit is contained in:
daitingting
2023-01-04 08:08:38 +00:00
parent 417f56c09d
commit 80cce4e580
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/story/control.php
+3 -2
View File
@@ -1364,7 +1364,7 @@ class story extends control
$buildApp = $tab == 'product' ? 'project' : $tab;
$releaseApp = $tab == 'execution' ? 'product' : $tab;
$this->session->set('productList', $uri . "#app={$tab}", 'product');
if(!isonlybody())$this->session->set('buildList', $uri, $buildApp);
if(!isonlybody()) $this->session->set('buildList', $uri, $buildApp);
$this->app->loadLang('bug');
$storyID = (int)$storyID;
@@ -1401,7 +1401,8 @@ class story extends control
}
elseif($from == 'project')
{
$this->loadModel('project')->setMenu($this->session->project);
$projectID = (isset($story->projects[$this->session->project]) || empty($story->projects)) ? $this->session->project : key($story->projects);
$this->loadModel('project')->setMenu($projectID);
}
elseif($from == 'qa')
{
module/story/model.php
+19 -2
View File
@@ -47,13 +47,30 @@ class storyModel extends model
if($setImgSize) $story->spec = $this->file->setImgSize($story->spec);
if($setImgSize) $story->verify = $this->file->setImgSize($story->verify);
$story->executions = $this->dao->select('t1.project, t2.name, t2.status, t2.type, t2.multiple')->from(TABLE_PROJECTSTORY)->alias('t1')
$projects = $this->dao->select('t1.project, t2.name, t2.status, t2.type, t2.multiple, t2.project AS parentProject')->from(TABLE_PROJECTSTORY)->alias('t1')
->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.project = t2.id')
->where('t2.type')->in('sprint,stage,kanban')
->where('t2.type')->in('sprint,stage,kanban,project')
->beginIF($story->twins)->andWhere('t1.story')->in(ltrim($story->twins, ',') . $story->id)
->beginIF(!$story->twins)->andWhere('t1.story')->in($story->id)
->orderBy('t1.`order` DESC')
->fetchAll('project');
$story->projects = array();
$story->executions = array();
foreach($projects as $project)
{
if($project->type == 'project')
{
$story->projects[$project->project] = $project->project;
}
else
{
$story->executions[$project->project] = $project;
if(!$project->multiple) $story->projects[$project->parentProject] = $project->parentProject;
}
}
$story->tasks = $this->dao->select('id, name, assignedTo, execution, project, status, consumed, `left`,type')->from(TABLE_TASK)
->where('deleted')->eq(0)
->beginIF($story->twins)->andWhere('story')->in(ltrim($story->twins, ',') . $story->id)