From f25ff4605b1327fbfe61c33391b80e47f1ee3c0a Mon Sep 17 00:00:00 2001
From: wangzemei <wangzemei@easycorp.ltd>
Date: Thu, 15 Sep 2022 06:10:54 +0000
Subject: [PATCH 1/6] * Finish #68935

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

diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 67099b3ebe..ba33aa17a7 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -41,6 +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;}
 </style>
 <div id="mainMenu" class="clearfix">
   <?php if(!$isProjectStory):?>
diff --git a/module/story/model.php b/module/story/model.php
index 2a0827c32a..e6eeccc5a9 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -4254,9 +4254,16 @@ 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'];
+                $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>";
+                $menu .= "<ul class='dropdown-menu pull-right text-center' role='menu' style='min-width:auto; padding: 5px;'>";
                 $menu   .= $this->buildMenu('story', 'recall', $params . "&from=list&confirm=no&storyType=$story->type", $story, $type, 'undo', 'hiddenwin', 'showinonlybody', false, '', $title);
+                $menu .= "</ul>";
+                $menu .= "</div>";
+                // $menu   .= $this->buildMenu('story', 'recall', $params . "&from=list&confirm=no&storyType=$story->type", $story, $type, 'undo', 'hiddenwin', 'showinonlybody', false, '', $title);
 
                 $menu .= $this->buildMenu('story', 'close', $params . "&from=&storyType=$story->type", $story, $type, '', '', 'iframe', true);
+                $menu .= "<div class='dividing-line'></div>";
                 $menu .= $this->buildMenu('story', 'edit', $params . "&kanbanGroup=default&storyType=$story->type", $story, $type, '', '', 'showinonlybody');
 
                 $tab = $this->app->tab == 'project' ? 'project' : 'qa';

From cfe34d776087398f691ecd50b7bb6b0ef9ce5c43 Mon Sep 17 00:00:00 2001
From: wangzemei <wangzemei@easycorp.ltd>
Date: Thu, 15 Sep 2022 06:45:02 +0000
Subject: [PATCH 2/6] * add judge

---
 module/story/model.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/module/story/model.php b/module/story/model.php
index e6eeccc5a9..3fc498bed3 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -4254,12 +4254,15 @@ 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'];
-                $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>";
-                $menu .= "<ul class='dropdown-menu pull-right text-center' role='menu' style='min-width:auto; padding: 5px;'>";
-                $menu   .= $this->buildMenu('story', 'recall', $params . "&from=list&confirm=no&storyType=$story->type", $story, $type, 'undo', 'hiddenwin', 'showinonlybody', false, '', $title);
-                $menu .= "</ul>";
-                $menu .= "</div>";
+                if(common::hasPriv('story', 'recall'))
+                {
+                    $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>";
+                    $menu .= "<ul class='dropdown-menu pull-right text-center' role='menu' style='min-width:auto; padding: 5px;'>";
+                    $menu   .= $this->buildMenu('story', 'recall', $params . "&from=list&confirm=no&storyType=$story->type", $story, $type, 'undo', 'hiddenwin', 'showinonlybody', false, '', $title);
+                    $menu .= "</ul>";
+                    $menu .= "</div>";
+                }
                 // $menu   .= $this->buildMenu('story', 'recall', $params . "&from=list&confirm=no&storyType=$story->type", $story, $type, 'undo', 'hiddenwin', 'showinonlybody', false, '', $title);
 
                 $menu .= $this->buildMenu('story', 'close', $params . "&from=&storyType=$story->type", $story, $type, '', '', 'iframe', true);

From 13c738817bd32223082289e1d5d88009d4a0f249 Mon Sep 17 00:00:00 2001
From: wangzemei <wangzemei@easycorp.ltd>
Date: Thu, 15 Sep 2022 07:01:59 +0000
Subject: [PATCH 3/6] * add dividing judge

---
 module/story/model.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/module/story/model.php b/module/story/model.php
index 3fc498bed3..1ca418f4c4 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -4266,7 +4266,12 @@ class storyModel extends model
                 // $menu   .= $this->buildMenu('story', 'recall', $params . "&from=list&confirm=no&storyType=$story->type", $story, $type, 'undo', 'hiddenwin', 'showinonlybody', false, '', $title);
 
                 $menu .= $this->buildMenu('story', 'close', $params . "&from=&storyType=$story->type", $story, $type, '', '', 'iframe', true);
-                $menu .= "<div class='dividing-line'></div>";
+                if((common::hasPriv('story', 'processStoryChange') || common::hasPriv('story', 'change') || common::hasPriv('story', 'submitReview') || common::hasPriv('story', 'review') || common::hasPriv('story', 'recall')) &&
+                    (common::hasPriv('story', 'edit') || common::hasPriv('story', 'createCase') || common::hasPriv('story', 'batchCreate') || common::hasPriv('projectstory', 'unlinkStory')))
+                {
+                    $menu .= "<div class='dividing-line'></div>";
+                }
+                
                 $menu .= $this->buildMenu('story', 'edit', $params . "&kanbanGroup=default&storyType=$story->type", $story, $type, '', '', 'showinonlybody');
 
                 $tab = $this->app->tab == 'project' ? 'project' : 'qa';

From ea750ec99e91065f59f59fa90874cfec0289fda4 Mon Sep 17 00:00:00 2001
From: wangzemei <wangzemei@easycorp.ltd>
Date: Thu, 15 Sep 2022 08:32:48 +0000
Subject: [PATCH 4/6] * add dividing judge

---
 module/story/model.php | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/module/story/model.php b/module/story/model.php
index 1ca418f4c4..98a4bc47c0 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -4254,7 +4254,15 @@ 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'];
-                if(common::hasPriv('story', 'recall'))
+
+                $storyPriv = array(common::hasPriv('story', 'processStoryChange'), common::hasPriv('story', 'change'), common::hasPriv('story', 'submitReview'), common::hasPriv('story', 'review'), common::hasPriv('story', 'close'));
+                $storyPrivCount = 0;
+                foreach($storyPriv as $value){
+                    if($value == 1){
+                        $storyPrivCount ++;
+                    }
+                }
+                if(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>";
@@ -4262,11 +4270,12 @@ class storyModel extends model
                     $menu   .= $this->buildMenu('story', 'recall', $params . "&from=list&confirm=no&storyType=$story->type", $story, $type, 'undo', 'hiddenwin', 'showinonlybody', false, '', $title);
                     $menu .= "</ul>";
                     $menu .= "</div>";
+                } else {
+                    $menu   .= $this->buildMenu('story', 'recall', $params . "&from=list&confirm=no&storyType=$story->type", $story, $type, 'undo', 'hiddenwin', 'showinonlybody', false, '', $title);
                 }
-                // $menu   .= $this->buildMenu('story', 'recall', $params . "&from=list&confirm=no&storyType=$story->type", $story, $type, 'undo', 'hiddenwin', 'showinonlybody', false, '', $title);
 
                 $menu .= $this->buildMenu('story', 'close', $params . "&from=&storyType=$story->type", $story, $type, '', '', 'iframe', true);
-                if((common::hasPriv('story', 'processStoryChange') || common::hasPriv('story', 'change') || common::hasPriv('story', 'submitReview') || common::hasPriv('story', 'review') || common::hasPriv('story', 'recall')) &&
+                if((common::hasPriv('story', 'processStoryChange') || common::hasPriv('story', 'change') || common::hasPriv('story', 'submitReview') || common::hasPriv('story', 'review') || common::hasPriv('story', 'close')) &&
                     (common::hasPriv('story', 'edit') || common::hasPriv('story', 'createCase') || common::hasPriv('story', 'batchCreate') || common::hasPriv('projectstory', 'unlinkStory')))
                 {
                     $menu .= "<div class='dividing-line'></div>";

From eed29fef1f4ee17ca33f3f65c16be9d73aea977b Mon Sep 17 00:00:00 2001
From: wangzemei <wangzemei@easycorp.ltd>
Date: Thu, 15 Sep 2022 09:02:32 +0000
Subject: [PATCH 5/6] * modify judge

---
 module/story/model.php | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/module/story/model.php b/module/story/model.php
index 98a4bc47c0..6bfdde65fc 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -4255,28 +4255,26 @@ class storyModel extends model
                 $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', 'processStoryChange'), common::hasPriv('story', 'change'), common::hasPriv('story', 'submitReview'), common::hasPriv('story', 'review'), common::hasPriv('story', 'close'));
                 $storyPrivCount = 0;
-                foreach($storyPriv as $value){
-                    if($value == 1){
-                        $storyPrivCount ++;
-                    }
+                foreach($storyPriv as $value)
+                {
+                    if($value == 1) $storyPrivCount ++;
                 }
                 if(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>";
                     $menu .= "<ul class='dropdown-menu pull-right text-center' role='menu' style='min-width:auto; padding: 5px;'>";
-                    $menu   .= $this->buildMenu('story', 'recall', $params . "&from=list&confirm=no&storyType=$story->type", $story, $type, 'undo', 'hiddenwin', 'showinonlybody', false, '', $title);
+                    $menu .= $this->buildMenu('story', 'recall', $params . "&from=list&confirm=no&storyType=$story->type", $story, $type, 'undo', 'hiddenwin', 'showinonlybody', false, '', $title);
                     $menu .= "</ul>";
                     $menu .= "</div>";
                 } else {
-                    $menu   .= $this->buildMenu('story', 'recall', $params . "&from=list&confirm=no&storyType=$story->type", $story, $type, 'undo', 'hiddenwin', 'showinonlybody', false, '', $title);
+                    $menu .= $this->buildMenu('story', 'recall', $params . "&from=list&confirm=no&storyType=$story->type", $story, $type, 'undo', 'hiddenwin', 'showinonlybody', false, '', $title);
                 }
 
                 $menu .= $this->buildMenu('story', 'close', $params . "&from=&storyType=$story->type", $story, $type, '', '', 'iframe', true);
-                if((common::hasPriv('story', 'processStoryChange') || common::hasPriv('story', 'change') || common::hasPriv('story', 'submitReview') || common::hasPriv('story', 'review') || common::hasPriv('story', 'close')) &&
-                    (common::hasPriv('story', 'edit') || common::hasPriv('story', 'createCase') || common::hasPriv('story', 'batchCreate') || common::hasPriv('projectstory', 'unlinkStory')))
+                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')))
                 {
                     $menu .= "<div class='dividing-line'></div>";
                 }

From ea779aab36514cb00dfc97184847a35b19564f1f Mon Sep 17 00:00:00 2001
From: wangzemei <wangzemei@easycorp.ltd>
Date: Thu, 15 Sep 2022 09:07:39 +0000
Subject: [PATCH 6/6] * modify count

---
 module/story/model.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/module/story/model.php b/module/story/model.php
index 6bfdde65fc..4d5a36d2d5 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -4256,11 +4256,7 @@ class storyModel extends model
                 $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'));
-                $storyPrivCount = 0;
-                foreach($storyPriv as $value)
-                {
-                    if($value == 1) $storyPrivCount ++;
-                }
+                $storyPrivCount = array_sum($storyPriv);
                 if(common::hasPriv('story', 'recall') && ($storyPrivCount > 1))
                 {
                     $menu .= "<div class='btn-group dropup' style='margin-left:-5px;'>";