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

* Finish task #40876

Browse Source
This commit is contained in:
zenggang
2021-08-05 16:57:49 +08:00
parent 79b72edf49
commit 2675cea5ad
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/story/model.php
+16
View File
@@ -4061,9 +4061,25 @@ class storyModel extends model
if(count($tracks) < $pager->recPerPage)
{
/* Show of child story */
$storiesCopy = array();
foreach($stories as $id => $story)
{
$storiesCopy[$id] = $story;
if(isset($story->children) and count($story->children) > 0)
{
foreach($story->children as $childID => $children)
{
$storiesCopy[$childID] = $children;
}
}
}
$stories = $storiesCopy;
foreach($stories as $id => $story)
{
$stories[$id] = new stdclass();
$stories[$id]->parent = $story->parent;
$stories[$id]->title = $story->title;
$stories[$id]->cases = $this->loadModel('testcase')->getStoryCases($id);
$stories[$id]->bugs = $this->loadModel('bug')->getStoryBugs($id);
module/story/view/track.html.php
+4 -1
View File
@@ -69,7 +69,10 @@
<?php $i = 1;?>
<?php foreach($track as $storyID => $story):?>
<?php if($i != 1) echo '<tr>';?>
<td style='padding-left: 10px;'><?php echo html::a($this->createLink($module, 'view', "storyID=$storyID"), $story->title, '',"title='$story->title' data-app='$openApp'");?></td>
<td style='padding-left: 10px;'>
<?php if($story->parent > 0):?><span class="label label-badge label-light" title="<?php echo $this->lang->story->children;?>"><?php echo $this->lang->story->childrenAB;?></span><?php endif;?>
<?php echo html::a($this->createLink($module, 'view', "storyID=$storyID"), $story->title, '',"title='$story->title' data-app='$openApp'");?>
</td>
<td>
<?php foreach($story->tasks as $taskID => $task):?>
<?php echo html::a($this->createLink('task', 'view', "taskID=$taskID"), $task->name, '', "title='$task->name'") . '<br/>';?>