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

* finish task #40466.

Browse Source
This commit is contained in:
wangyidong
2021-07-26 11:46:06 +08:00
parent 12361696b2
commit effe28a36e
3 changed files with 53 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/story/control.php
+1 -1
View File
@@ -1500,7 +1500,7 @@ class story extends control
/* Load pager and get tracks. */
$this->app->loadClass('pager', $static = true);
$pager = new pager($recTotal, $recPerPage, $pageID);
$tracks = $this->story->getTracks($productID, $branch, $pager);
$tracks = $this->story->getTracks($productID, $branch, $projectID, $pager);
if($projectID)
{
module/story/model.php
+50 -12
View File
@@ -343,7 +343,7 @@ class storyModel extends model
/* push this story to gitlab issue */
$object = $this->getByID($storyID);
$this->loadModel('gitlab')->apiCreateIssue($this->post->gitlab, $this->post->gitlabProject, 'story', $storyID, $object);
return array('status' => 'created', 'id' => $storyID);
}
return false;
@@ -351,9 +351,9 @@ class storyModel extends model
/**
* Create story from gitlab issue.
*
*
* @param object $story
* @param int $executionID
* @param int $executionID
* @access public
* @return int
*/
@@ -380,7 +380,7 @@ class storyModel extends model
$data->spec = $story->spec;
$data->verify = $story->spec;
$this->dao->insert(TABLE_STORYSPEC)->data($data)->exec();
/* Link story to execution. */
$this->linkStory($executionID, $story->product, $storyID);
@@ -1883,13 +1883,13 @@ class storyModel extends model
$story->assignedDate = $now;
$this->dao->update(TABLE_STORY)->data($story)->autoCheck()->where('id')->eq((int)$storyID)->exec();
if(!dao::isError())
if(!dao::isError())
{
$this->loadModel('gitlab');
$relation = $this->gitlab->getRelationByObject('story', $storyID);
$story->assignee_id = $this->gitlab->getGitlabUserID($relation->gitlabID, $story->assignedTo);
if($story->assignee_id != '') $this->gitlab->apiUpdateIssue($relation->gitlabID, $relation->projectID, $relation->issueID, 'story', $story, $storyID);
/* Push this story to gitlab issue. */
$this->loadModel('gitlab');
$relation = $this->gitlab->getRelationByObject('story', $storyID);
@@ -3504,7 +3504,7 @@ class storyModel extends model
$storyIdList = array();
if(isset($stories['id']))
{
$storyIdList = array($stories['id'] => $stories['id']);
$storyIdList = array($stories['id'] => $stories['id']);
}
else
{
@@ -3938,11 +3938,12 @@ class storyModel extends model
*
* @param int $productID
* @param int $branch
* @param int $projectID
* @param object $pager
* @access public
* @return bool|array
*/
public function getTracks($productID = 0, $branch = 0, $pager = null)
public function getTracks($productID = 0, $branch = 0, $projectID = 0, $pager = null)
{
$tracks = array();
$sourcePageID = $pager->pageID;
@@ -3950,7 +3951,24 @@ class storyModel extends model
if($this->config->URAndSR)
{
$requirements = $this->getProductStories($productID, $branch, 0, 'all', 'requirement', 'id_desc', true, '', $pager);
$projectStories = array();
if($projectID)
{
$requirements = $this->dao->select('t3.*')->from(TABLE_PROJECTSTORY)->alias('t1')
->leftJoin(TABLE_RELATION)->alias('t2')->on("t1.story=t2.AID && t2.AType='story'")
->leftJoin(TABLE_STORY)->alias('t3')->on("t2.BID=t3.id && t2.BType='requirement'")
->where('t1.project')->eq($projectID)
->andWhere('t1.product')->eq($productID)
->andWhere('t3.id')->ne('')
->page($pager, 't3.id')
->fetchAll('id');
$projectStories = $this->getExecutionStories($projectID, $productID, $branch, '`order`_desc', 'all', 0, 'story');
}
else
{
$requirements = $this->getProductStories($productID, $branch, 0, 'all', 'requirement', 'id_desc', true, '', $pager);
}
if($pager->pageID != $sourcePageID)
{
$requirements = array();
@@ -3963,6 +3981,12 @@ class storyModel extends model
$stories = empty($stories) ? array() : $stories;
foreach($stories as $id => $title)
{
if($projectStories and !isset($projectStories[$id]))
{
unset($stories[$id]);
continue;
}
$stories[$id] = new stdclass();
$stories[$id]->title = $title;
$stories[$id]->cases = $this->loadModel('testcase')->getStoryCases($id);
@@ -3991,12 +4015,26 @@ class storyModel extends model
->andWhere('relation')->eq('subdivideinto')
->andWhere('product')->eq($productID)
->fetchPairs('BID', 'BID');
$stories = $this->getProductStories($productID, 0, 0, 'all', 'story', 'id_desc', true, $excludeStories);
if($stories) $pager->recTotal += 1;
if($projectID)
{
$stories = $this->getExecutionStories($projectID, $productID, $branch, '`order`_desc', 'all', 0, 'story', $excludeStories);
}
else
{
$stories = $this->getProductStories($productID, 0, 0, 'all', 'story', 'id_desc', true, $excludeStories);
}
if($stories) $pager->recTotal += count($stories);
}
else
{
$stories = $this->getProductStories($productID, 0, 0, 'all', 'story', 'id_desc', true, $excludeStories, $pager);
if($projectID)
{
$stories = $this->getExecutionStories($projectID, $productID, $branch, '`order`_desc', 'all', 0, 'story', $excludeStories, $pager);
}
else
{
$stories = $this->getProductStories($productID, 0, 0, 'all', 'story', 'id_desc', true, $excludeStories, $pager);
}
}
if(count($tracks) < $pager->recPerPage)
module/testtask/view/results.html.php
+2 -1
View File
@@ -51,7 +51,8 @@
<td class='w-50px text-center'><i class='collapse-handle icon-angle-down text-muted'></i></td>
</tr>
<?php $executionParam = ($this->app->openApp == 'execution' and isset($testtask)) ? "executionID=$testtask->execution" : "";?>
<?php $params = isset($testtask) ? ",testtask=$testtask->id,{$executionParam},buildID=$testtask->build" : ",$executionParam";?>
<?php $params = isset($testtask) ? ",testtask=$testtask->id,buildID=$testtask->build" : "";?>
<?php if($executionParam) $params .= ',' . $executionParam;?>
<tr class='result-detail hide' id='tr-detail_<?php echo $trCount++; ?>'>
<td colspan='7' class='pd-0'>
<?php $projectParam = $this->app->openApp == 'project' ? "projectID={$this->session->project}," : ''?>