From c22503af7bce86e1f3d95b1985c7ca167d843ade Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.ltd>
Date: Wed, 1 Dec 2021 13:18:47 +0800
Subject: [PATCH] * Finish task #44987,44988,44989.

---
 module/execution/view/story.html.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/execution/view/story.html.php b/module/execution/view/story.html.php
index 6322a5f7a9..08b9cbcedb 100644
--- a/module/execution/view/story.html.php
+++ b/module/execution/view/story.html.php
@@ -220,8 +220,8 @@
             <?php endif;?>
             <td class='c-pri'><span class='label-pri <?php echo 'label-pri-' . $story->pri?>' title='<?php echo zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
             <td class='c-name' title="<?php echo $story->title?>">
-              <?php $showBranch = isset($this->config->execution->story->showBranch) ? $this->config->execution->story->showBranch : 1;?>
-              <?php if($isShowBranch and isset($branchGroups[$story->product][$story->branch]) and $showBranch) echo "<span class='label label-outline label-badge'>" . $branchGroups[$story->product][$story->branch] . '</span>';?>
+              <?php if($isShowBranch) $isShowBranch = isset($this->config->execution->story->showBranch) ? $this->config->execution->story->showBranch : 1;?>
+              <?php if(isset($branchGroups[$story->product][$story->branch]) and $isShowBranch) echo "<span class='label label-outline label-badge'>" . $branchGroups[$story->product][$story->branch] . '</span>';?>
               <?php if(!empty($story->module) and isset($modulePairs[$story->module])) echo "<span class='label label-gray label-badge'>{$modulePairs[$story->module]}</span> ";?>
               <?php if($story->parent > 0) echo "<span class='label'>{$lang->story->childrenAB}</span>";?>
               <?php echo html::a($storyLink,$story->title, null, "style='color: $story->color' data-app='execution'");?>