* Conflict resolution #17036.
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user