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

Merge branch 'sprint/174_mayue_44987,44988,44989' into 'master'

Browse Source 
* Finish task #44987,44988,44989.

See merge request easycorp/zentaopms!657
This commit is contained in:
李玉春
2021-11-30 05:02:41 +00:00
parent 0322f02b54 71387b1d37
commit 4b223ec01b
7 changed files with 56 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testcase/model.php
+8 -1
View File
@@ -1551,7 +1551,14 @@ class testcaseModel extends model
echo "</span>";
break;
case 'title':
$showBranch = isset($this->config->testcase->browse->showBranch) ? $this->config->testcase->browse->showBranch : 1;
if($this->app->tab == 'project')
{
$showBranch = isset($this->config->project->testcase->showBranch) ? $this->config->project->testcase->showBranch : 1;
}
else
{
$showBranch = isset($this->config->testcase->browse->showBranch) ? $this->config->testcase->browse->showBranch : 1;
}
if(isset($branches[$case->branch]) and $showBranch) echo "<span class='label label-outline label-badge'>{$branches[$case->branch]}</span> ";
if($modulePairs and $case->module and isset($modulePairs[$case->module])) echo "<span class='label label-gray label-badge'>{$modulePairs[$case->module]}</span> ";
echo $canView ? ($fromCaseID ? html::a($caseLink, $case->title, null, "style='color: $case->color' data-app='{$this->app->tab}'") . html::a(helper::createLink('testcase', 'view', "caseID=$fromCaseID"), "[<i class='icon icon-share' title='{$this->lang->testcase->fromCase}'></i>#$fromCaseID]", '', "data-app='{$this->app->tab}'") : html::a($caseLink, $case->title, null, "style='color: $case->color' data-app='{$this->app->tab}'")) : "<span style='color: $case->color'>$case->title</span>";