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

Merge branch 'sprint/tianshujie_fixbug' into 'master'

Browse Source 
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!6823
This commit is contained in:
王怡栋
2023-02-01 09:15:12 +00:00
parent 6da21196a9 36c76ee62f
commit 78c6c67a55
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/model.php
+5 -3
View File
@@ -2274,13 +2274,15 @@ class projectModel extends model
}
break;
case 'name':
$prefix = '';
$suffix = '';
$prefix = '';
$suffix = '';
$projectIcon = '';
if(isset($project->delay)) $suffix = "<span class='label label-danger label-badge'>{$this->lang->project->statusList['delay']}</span>";
$projectType = $project->model == 'scrum' ? 'sprint' : $project->model;
if(!empty($suffix) or !empty($prefix)) echo '<div class="project-name' . (empty($prefix) ? '' : ' has-prefix') . (empty($suffix) ? '' : ' has-suffix') . '">';
if(!empty($prefix)) echo $prefix;
echo html::a($projectLink, "<i class='text-muted icon icon-{$projectType}'></i> " . $project->name, '', "class='text-ellipsis text-primary'");
if($this->config->vision == 'rnd') $projectIcon = "<i class='text-muted icon icon-{$projectType}'></i> ";
echo html::a($projectLink, $projectIcon . $project->name, '', "class='text-ellipsis text-primary'");
if(!empty($suffix)) echo $suffix;
if(!empty($suffix) or !empty($prefix)) echo '</div>';
break;
module/testcase/control.php
+8 -1
View File
@@ -998,7 +998,14 @@ class testcase extends control
if($case->module) $moduleIdList = $this->tree->getAllChildID($case->module);
$moduleIdList = (!in_array($this->app->tab, array('execution', 'project')) and empty($stories)) ? 0 : $moduleIdList;
$stories = $this->story->getProductStoryPairs($productID, $case->branch, $moduleIdList, 'all','id_desc', 0, 'full', 'story', false);
if($this->app->tab == 'execution')
{
$stories = $this->story->getExecutionStoryPairs($case->execution, $productID, $case->branch, $moduleIdList);
}
else
{
$stories = $this->story->getProductStoryPairs($productID, $case->branch, $moduleIdList, 'all','id_desc', 0, 'full', 'story', false);
}
$this->view->productID = $productID;
$this->view->product = $product;