From d43547072d8517455111122f2d3dd02b32e47802 Mon Sep 17 00:00:00 2001
From: wangzemei <wangzemei@easycorp.ltd>
Date: Fri, 16 Sep 2022 03:21:57 +0000
Subject: [PATCH] * Fix bug 27511

---
 module/product/view/browse.html.php | 4 ++--
 module/story/model.php              | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index ba33aa17a7..dc25677ab2 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -41,8 +41,8 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
 .btn-group a i.icon-plus, .btn-group a i.icon-link {font-size: 16px;}
 .btn-group a.btn-secondary, .btn-group a.btn-primary {border-right: 1px solid rgba(255,255,255,0.2);}
 .btn-group button.dropdown-toggle.btn-secondary, .btn-group button.dropdown-toggle.btn-primary {padding:6px;}
-#productStoryForm #storyList .c-actions {overflow: visible;}
-#productStoryForm #storyList .dividing-line {width: 1px; height: 16px; display: inline-block; vertical-align: middle; background: #E4E4E4; margin: 0 4px 0 0;}
+#productStoryForm table tbody tr td.c-actions {overflow: visible;}
+#productStoryForm table tbody tr td.c-actions .dividing-line {width: 1px; height: 16px; display: inline-block; vertical-align: middle; background: #E4E4E4; margin: 0 4px 0 0;}
 </style>
 <div id="mainMenu" class="clearfix">
   <?php if(!$isProjectStory):?>
diff --git a/module/story/model.php b/module/story/model.php
index 4d5a36d2d5..148c1a957e 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -4254,10 +4254,9 @@ class storyModel extends model
                 $isClick = $this->isClickable($story, 'recall');
                 $title   = $story->status == 'changing' ? $this->lang->story->recallChange : $this->lang->story->recall;
                 $title   = $isClick ? $title : $this->lang->story->recallTip['actived'];
-
-                $storyPriv      = array(common::hasPriv('story', 'processStoryChange'), common::hasPriv('story', 'change'), common::hasPriv('story', 'submitReview'), common::hasPriv('story', 'review'), common::hasPriv('story', 'close'));
+                $storyPriv      = array(common::hasPriv('story', 'change'), common::hasPriv('story', 'submitReview'), common::hasPriv('story', 'review'), common::hasPriv('story', 'close'));
                 $storyPrivCount = array_sum($storyPriv);
-                if(common::hasPriv('story', 'recall') && ($storyPrivCount > 1))
+                if($this->app->tab == 'product' and common::hasPriv('story', 'recall') && ($storyPrivCount > 1))
                 {
                     $menu .= "<div class='btn-group dropup' style='margin-left:-5px;'>";
                     $menu .= "<button type='button' class='btn icon-caret-down dropdown-toggle' data-toggle='dropdown' title='{$this->lang->more}' style='width: 16px; padding-left: 0px;'></button>";
@@ -4270,7 +4269,7 @@ class storyModel extends model
                 }
 
                 $menu .= $this->buildMenu('story', 'close', $params . "&from=&storyType=$story->type", $story, $type, '', '', 'iframe', true);
-                if((common::hasPriv('story', 'recall') or $storyPrivCount > 0) and (common::hasPriv('story', 'edit') or common::hasPriv('story', 'createCase') or common::hasPriv('story', 'batchCreate') or common::hasPriv('projectstory', 'unlinkStory')))
+                if($this->app->tab == 'product' and (common::hasPriv('story', 'recall') or $storyPrivCount > 0) and (common::hasPriv('story', 'edit') or common::hasPriv('story', 'createCase') or common::hasPriv('story', 'batchCreate')))
                 {
                     $menu .= "<div class='dividing-line'></div>";
                 }