From afe93cf022957dffed7108b35a3006b446ad63c5 Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Mon, 19 Jun 2023 13:17:13 +0800
Subject: [PATCH] * Fix bug #35982, #35932.

---
 module/product/control.php          | 2 +-
 module/product/view/browse.html.php | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/module/product/control.php b/module/product/control.php
index 1c605d327e..29b07e967f 100755
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -250,7 +250,7 @@ class product extends control
 
         /* Get stories. */
         $projectProducts = array();
-        if($isProjectStory and $storyType == 'story')
+        if($isProjectStory)
         {
             $showBranch = $this->loadModel('branch')->showBranch($productID, 0, $projectID);
 
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index fcb8e10d82..1cf4059e6e 100755
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -73,7 +73,7 @@ js::set('vision',        $this->config->vision);
   </div>
   <?php endif;?>
   <div class="btn-toolbar pull-left">
-    <?php if($isProjectStory): ?>
+    <?php if($isProjectStory):?>
     <?php if(!empty($project->hasProduct)):?>
     <div class='btn-group'>
       <a href='javascript:;' class='btn btn-link btn-limit text-ellipsis' data-toggle='dropdown' style="max-width: 120px;"><div class='text' style="overflow: hidden;" title='<?php echo $productName;?>'><?php echo $productName;?></div> <span class='caret'></span></a>
@@ -103,6 +103,12 @@ js::set('vision',        $this->config->vision);
     <?php
     if(!commonModel::isTutorialMode())
     {
+        if($isProjectStory and $storyType == 'requirement')
+        {
+            unset($lang->projectstory->featureBar['story']['linkedExecution']);
+            unset($lang->projectstory->featureBar['story']['unlinkedExecution']);
+        }
+
         foreach(customModel::getFeatureMenu($this->app->rawModule, $this->app->rawMethod) as $menuItem)
         {
             if(isset($menuItem->hidden)) continue;