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

Merge branch 'master' of https://github.com/easysoft/zentaopms

Browse Source
This commit is contained in:
reneeteng
2020-03-16 08:24:50 +08:00
parent fd83116e1d 8dda089476
commit ac9c8a9559
2 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/product/view/browse.html.php
View File

@@ -205,7 +205,7 @@
<?php $class = $i == 0 ? ' table-child-top' : '';?>
<?php $class .= ($i + 1 == count($story->children)) ? ' table-child-bottom' : '';?>
<tr class='table-children<?php echo $class;?> parent-<?php echo $story->id;?>' data-id='<?php echo $child->id?>' data-status='<?php echo $child->status?>' data-estimate='<?php echo $child->estimate?>'>
<?php foreach($setting as $key => $value) $this->story->printCell($value, $child, $users, $branches, $storyStages, $modulePairs, $storyTasks, $storyBugs, $storyCases, $useDatatable ? 'datatable' : 'table');?>
<?php foreach($setting as $key => $value) $this->story->printCell($value, $child, $users, $branches, $storyStages, $modulePairs, $storyTasks, $storyBugs, $storyCases, $useDatatable ? 'datatable' : 'table', $storyType);?>
</tr>
<?php $i ++;?>
<?php endforeach;?>

38
module/story/model.php
View File

@@ -1597,7 +1597,7 @@ class storyModel extends model
->andWhere('deleted')->eq(0)
->andWhere('type')->eq($type)
->orderBy($orderBy)->page($pager)->fetchAll('id');
return $this->mergePlanTitle($productID, $stories, $branch);
return $this->mergePlanTitle($productID, $stories, $branch, $type);
}
/**
@@ -1757,7 +1757,7 @@ class storyModel extends model
->orderBy($orderBy)
->page($pager)
->fetchAll('id');
return $this->mergePlanTitle($productID, $stories, $branch);
return $this->mergePlanTitle($productID, $stories, $branch, $type);
}
/**
@@ -1783,7 +1783,7 @@ class storyModel extends model
->orderBy($orderBy)
->page($pager)
->fetchAll('id');
return $this->mergePlanTitle($productID, $stories, $branch);
return $this->mergePlanTitle($productID, $stories, $branch, $type);
}
/**
@@ -2106,7 +2106,7 @@ class storyModel extends model
$productIdList = array();
foreach($stories as $story) $productIdList[$story->product] = $story->product;
return $this->mergePlanTitle($productIdList, $stories);
return $this->mergePlanTitle($productIdList, $stories, 0, $storyType);
}
/**
@@ -2618,6 +2618,7 @@ class storyModel extends model
if($action == 'activate') return $story->status == 'closed';
if($action == 'assignto') return $story->status != 'closed';
if($action == 'batchcreate' and $story->parent > 0) return false;
if($action == 'batchcreate' and $story->type == 'requirement') return false;
if($action == 'batchcreate' and ($story->status != 'active' or $story->stage != 'wait')) return false;
return true;
@@ -2633,7 +2634,7 @@ class storyModel extends model
* @access public
* @return array
*/
public function mergePlanTitle($productID, $stories, $branch = 0)
public function mergePlanTitle($productID, $stories, $branch = 0, $type = 'story')
{
$query = $this->dao->get();
if(is_array($branch))
@@ -2647,6 +2648,26 @@ class storyModel extends model
->andWhere('deleted')->eq(0)
->fetchPairs('id', 'title');
/* For requirement children. */
if($type == 'requirement' && $this->config->storyCommon == 0)
{
$relations = $this->dao->select('DISTINCT AID, BID')->from(TABLE_RELATION)
->where('AID')->in(array_keys($stories))
->andWhere('AType')->eq('requirement')
->andWhere('BType')->eq('story')
->andWhere('relation')->eq('subdivideinto')
->fetchAll();
$group = array();
foreach($relations as $relation) $group[$relation->AID][] = $relation->BID;
foreach($stories as $story)
{
if(!isset($group[$story->id])) continue;
$story->children = $this->getByList($group[$story->id]);
}
}
$parents = array();
$tmpStories = array();
foreach($stories as $story)
@@ -2697,7 +2718,7 @@ class storyModel extends model
* @access public
* @return void
*/
public function printCell($col, $story, $users, $branches, $storyStages, $modulePairs = array(), $storyTasks = array(), $storyBugs = array(), $storyCases = array(), $mode = 'datatable')
public function printCell($col, $story, $users, $branches, $storyStages, $modulePairs = array(), $storyTasks = array(), $storyBugs = array(), $storyCases = array(), $mode = 'datatable', $storyType = 'story')
{
$canView = common::hasPriv('story', 'view');
$storyLink = helper::createLink('story', 'view', "storyID=$story->id");
@@ -2724,7 +2745,7 @@ class storyModel extends model
}
elseif($id == 'plan')
{
$title = $story->planTitle;
$title = isset($story->planTitle) ? $story->planTitle : '';
$class .= ' text-ellipsis';
}
else if($id == 'sourceNote')
@@ -2755,6 +2776,7 @@ class storyModel extends model
echo "</span>";
break;
case 'title':
if($storyType == 'requirement') echo '<span class="label label-badge label-light">SR</span> ';
if($story->parent > 0 and isset($story->parentName)) $story->title = "{$story->parentName} / {$story->title}";
if($story->branch and isset($branches[$story->branch])) echo "<span class='label label-outline label-badge'>{$branches[$story->branch]}</span> ";
if($story->module and isset($modulePairs[$story->module])) echo "<span class='label label-gray label-badge'>{$modulePairs[$story->module]}</span> ";
@@ -2763,7 +2785,7 @@ class storyModel extends model
if(!empty($story->children)) echo '<a class="story-toggle" data-id="' . $story->id . '"><i class="icon icon-angle-double-right"></i></a>';
break;
case 'plan':
echo $story->planTitle;
echo isset($story->planTitle) ? $story->planTitle : '';
break;
case 'branch':
echo zget($branches, $story->branch, '');