* Conflict resolution #17036.

This commit is contained in:
mayue
2021-12-02 15:40:02 +08:00
parent f6676e2757
commit 8ba4ebf390
+1 -1
View File
@@ -1433,7 +1433,7 @@ class testtaskModel extends model
echo "</span>";
break;
case 'title':
if(!empty($run->branch)) echo "<span class='label label-badge label-outline'>{$branches[$run->branch]}</span>";
if(!empty($branches)) echo "<span class='label label-badge label-outline'>{$branches[$run->branch]}</span>";
if($canView)
{
if($fromCaseID)