From 7d52b3717f5d5ebd92039dd58cbb40c4cd6412e5 Mon Sep 17 00:00:00 2001
From: qiyu-xie <qiyu_xie@163.com>
Date: Fri, 16 Apr 2021 11:42:56 +0800
Subject: [PATCH] * Fix bug#12087.

---
 module/execution/view/story.html.php | 60 ++++++++++++++------
 module/product/view/browse.html.php  | 84 ++++++++++++----------------
 2 files changed, 77 insertions(+), 67 deletions(-)

diff --git a/module/execution/view/story.html.php b/module/execution/view/story.html.php
index 29ef4f22df..09ca6e739f 100644
--- a/module/execution/view/story.html.php
+++ b/module/execution/view/story.html.php
@@ -22,9 +22,9 @@
 <?php js::set('typeError', sprintf($this->lang->error->notempty, $this->lang->task->type))?>
 <?php js::set('workingHourError', sprintf($this->lang->error->notempty, $this->lang->workingHour))?>
 <style>
-.btn-group a i.icon-plus {font-size: 16px;}
-.btn-group a.btn-secondary {border-right: 1px solid rgba(255,255,255,0.2);}
-.btn-group button.dropdown-toggle.btn-secondary {padding:6px;}
+.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;}
 </style>
 <div id="mainMenu" class="clearfix">
   <?php if(!empty($module->name) or !empty($product->name) or !empty($branch)):?>
@@ -58,17 +58,39 @@
     if(common::canModify('execution', $execution))
     {
         $this->lang->story->create = $this->lang->execution->createStory;
+
         if($productID and !$this->loadModel('story')->checkForceReview())
         {
-            $storyModuleID = (int)$this->cookie->storyModuleParam;
+            $storyModuleID   = (int)$this->cookie->storyModuleParam;
             $createStoryLink = $this->createLink('story', 'create', "productID=$productID&branch=0&moduleID={$storyModuleID}&story=0&execution=$execution->id");
+            $batchCreateLink = $this->createLink('story', 'batchCreate', "productID=$productID&branch=0&moduleID={$storyModuleID}&story=0&execution=$execution->id");
+
+            $buttonLink  = '';
+            $buttonTitle = '';
+            if(common::hasPriv('story', 'batchCreate'))
+            {
+                $buttonLink  = $batchCreateLink;
+                $buttonTitle = $lang->story->batchCreate;
+            }
+            if(common::hasPriv('story', 'create'))
+            {
+                $buttonLink  = $createStoryLink;
+                $buttonTitle = $lang->story->create;
+            }
+
+            $hidden = empty($buttonLink) ? 'hidden' : '';
             echo "<div class='btn-group dropdown'>";
-            echo html::a($createStoryLink, "<i class='icon icon-plus'></i> {$lang->story->create}", '', "class='btn btn-secondary' data-app='execution'");
-            echo "<button type='button' class='btn btn-secondary dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>";
-            echo "<ul class='dropdown-menu pull-right'>";
-            if(common::hasPriv('story', 'create')) echo '<li>' . html::a($createStoryLink, $lang->story->create, '', "data-app='execution'") . '</li>';
-            if(common::hasPriv('story', 'batchCreate')) echo '<li>' . html::a($this->createLink('story', 'batchCreate', "productID=$productID&branch=0&moduleID={$storyModuleID}&story=0&execution=$execution->id"), $lang->story->batchCreate, '', "data-app='execution'") . '</li>';
-            echo '</ul>';
+            echo html::a($buttonLink, "<i class='icon icon-plus'></i> $buttonTitle", '', "class='btn btn-secondary $hidden' data-app='execution'");
+
+            if($common::hasPriv('story', 'create') and common::hasPriv('story', 'batchCreate'))
+            {
+                echo "<button type='button' class='btn btn-secondary dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>";
+                echo "<ul class='dropdown-menu pull-right'>";
+                echo '<li>' . html::a($createStoryLink, $lang->story->create, '', "data-app='execution'") . '</li>';
+                echo '<li>' . html::a($batchCreateLink, $lang->story->batchCreate, '', "data-app='execution'") . '</li>';
+                echo '</ul>';
+            }
+
             echo '</div>';
         }
 
@@ -79,14 +101,16 @@
         }
         else
         {
-            echo "<div class='btn-group dropdown-hover'>";
-            echo "<button type='button' class='btn btn-primary' id='linkButton'>";
-            echo "<i class='icon-link'></i> {$lang->execution->linkStory} <span class='caret'></span>";
-            echo '</button>';
-            echo "<ul class='dropdown-menu pull-right' id='linkActionMenu'>";
-            if(common::hasPriv('execution', 'linkStory')) echo '<li>' . html::a(inlink('linkStory', "execution=$execution->id"), $lang->execution->linkStory). "</li>";
-            if(common::hasPriv('execution', 'importPlanStories')) echo '<li>' . html::a('#linkStoryByPlan', $lang->execution->linkStoryByPlan, '', 'data-toggle="modal"') . "</li>";
-            echo '</ul>';
+            echo "<div class='btn-group dropdown'>";
+            if(common::hasPriv('execution', 'linkStory')) echo html::a(inlink('linkStory', "execution=$execution->id"), "<i class='icon-link'></i> {$lang->execution->linkStory}", '', "class='btn btn-primary'");
+            if(common::hasPriv('execution', 'linkStory') and common::hasPriv('execution', 'importPlanStories'))
+            {
+                echo "<button type='button' class='btn btn-primary dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>";
+                echo "<ul class='dropdown-menu pull-right'>";
+                echo '<li>' . html::a(inlink('linkStory', "execution=$execution->id"), $lang->execution->linkStory). "</li>";
+                echo '<li>' . html::a('#linkStoryByPlan', $lang->execution->linkStoryByPlan, '', 'data-toggle="modal"') . "</li>";
+                echo '</ul>';
+            }
             echo '</div>';
         }
     }
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index aa543977a8..6f2bdfcfce 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -36,15 +36,9 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
 ?>
 <style>
 .btn-group .icon-close:before {font-size: 5px; vertical-align: 25%;}
-.btn-group a i.icon-plus {font-size: 16px;}
-<?php if($from == 'project'):?>
-.btn-group a.btn-secondary {border-right: 1px solid rgba(255,255,255,0.2);}
-.btn-group button.dropdown-toggle.btn-secondary {padding:6px;}
-<?php endif;?>
-<?php if($from == 'product'):?>
-.btn-group a.btn-primary {border-right: 1px solid rgba(255,255,255,0.2);}
-.btn-group button.dropdown-toggle.btn-primary {padding:6px;}
-<?php endif;?>
+.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;}
 </style>
 <div id="mainMenu" class="clearfix">
   <?php if(!$isProjectStory):?>
@@ -148,10 +142,28 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
     </div>
     <?php if(common::canModify('product', $product)):?>
     <div class='btn-group dropdown'>
-      <?php $buttonType = $from == 'project' ? 'btn-secondary' : 'btn-primary';?>
-      <?php $extraParam = $from == 'project' ? '' : "&bugID=0&planID=0&todoID=0&extra=&type=$storyType";?>
-      <?php echo html::a($this->createLink('story', 'create', "product=$productID&branch=$branch&moduleID=$moduleID&storyID=0&projectID={$projectID}$extraParam"), "<i class='icon icon-plus'></i> {$lang->story->create}", '', "class='btn $buttonType' data-app='$openApp'");?>
-      <?php if(!empty($productID)): ?>
+      <?php
+      $createStoryLink = $this->createLink('story', 'create', "product=$productID&branch=$branch&moduleID=$moduleID&storyID=0&projectID=$projectID&bugID=0&planID=0&todoID=0&extra=&type=$storyType");
+      $batchCreateLink = $this->createLink('story', 'batchCreate', "productID=$productID&branch=$branch&moduleID=$moduleID&storyID=0&project=$projectID&plan=0&type=$storyType");
+
+      $buttonLink  = '';
+      $buttonTitle = '';
+      $buttonType  = $from == 'project' ? 'btn-secondary' : 'btn-primary';
+      if(common::hasPriv('story', 'batchCreate'))
+      {
+          $buttonLink  = empty($productID) ? '' : $batchCreateLink;
+          $buttonTitle = $lang->story->batchCreate;
+      }
+      if(common::hasPriv('story', 'create'))
+      {
+          $buttonLink  = $createStoryLink;
+          $buttonTitle = $lang->story->create;
+      }
+
+      $hidden = empty($buttonLink) ? 'hidden' : '';
+      echo html::a($buttonLink, "<i class='icon icon-plus'></i> $buttonTitle", '', "class='btn $buttonType $hidden' data-app='$openApp'");
+      ?>
+      <?php if(!empty($productID) and common::hasPriv('story', 'batchCreate') and common::hasPriv('story', 'create')): ?>
       <button type='button' class="btn <?php echo $buttonType?> dropdown-toggle" data-toggle='dropdown'><span class='caret'></span></button>
       <ul class='dropdown-menu pull-right'>
         <li>
@@ -165,37 +177,16 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
         }
         else
         {
-            if($from == 'project')
-            {
-                $link = $this->createLink('story', 'create', "product=$productID&branch=$branch&moduleID=$moduleID&storyID=0&projectID=$projectID");
-            }
-            else
-            {
-                $link = $this->createLink('story', 'create', "product=$productID&branch=$branch&moduleID=$moduleID&storyID=0&projectID=0&bugID=0&planID=0&todoID=0&extra=&type=$storyType");
-            }
-            $disabled = '';
-            if(!common::hasPriv('story', 'create'))
-            {
-                $link     = '###';
-                $disabled = 'disabled';
-            }
-            echo html::a($link, $lang->story->create, '', "class='$disabled' data-group='$openApp'");
+            echo html::a($createStoryLink, $lang->story->create, '', "data-group='$openApp'");
         }
         ?>
         </li>
-        <?php $batchDisabled = common::hasPriv('story', 'batchCreate') ? '' : "class='disabled'";?>
-        <li <?php echo $batchDisabled;?>>
-        <?php
-          $batchLink = $this->createLink('story', 'batchCreate', "productID=$productID&branch=$branch&moduleID=$moduleID&storyID=0&project=0&plan=0&type=$storyType");
-          if($isProjectStory) $batchLink = $this->createLink('story', 'batchCreate', "productID=$productID&branch=$branch&moduleID=$moduleID&storyID=0&project=$projectID");
-          echo html::a($batchLink, $lang->story->batchCreate, '', "data-group='$openApp'");
-        ?>
-        </li>
+        <li><?php echo html::a($batchCreateLink, $lang->story->batchCreate, '', "data-group='$openApp'");?></li>
       </ul>
       <?php endif;?>
     </div>
     <?php $isShow = $isProjectStory ? '' : "style='display: none;'";?>
-    <div class='btn-group dropdown-hover' <?php echo $isShow;?>>
+    <div class='btn-group dropdown' <?php echo $isShow;?>>
     <?php
     if(commonModel::isTutorialMode())
     {
@@ -204,24 +195,19 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
     }
     else
     {
-        if(empty($productID))
+        if(common::hasPriv('projectstory', 'linkStory')) echo html::a($this->createLink('projectstory', 'linkStory', "project=$projectID"), "<i class='icon-link'></i> {$lang->execution->linkStory}", '', "class='btn btn-primary'");
+        if(!empty($productID) and common::hasPriv('projectstory', 'linkStory') and common::hasPriv('projectstory', 'importPlanStories'))
         {
-            echo html::a($this->createLink('projectstory', 'linkStory', "project=$projectID"), "<i class='icon-link'></i> {$lang->execution->linkStory}", '', "class='btn btn-primary'");
-        }
-        else
-        {
-            echo "<button type='button' class='btn btn-primary' id='linkButton'>";
-            echo "<i class='icon-link'></i> {$lang->execution->linkStory} <span class='caret'></span>";
-            echo '</button>';
-            echo "<ul class='dropdown-menu pull-right' id='linkActionMenu'>";
-            if(common::hasPriv('projectstory', 'linkStory')) echo '<li>' . html::a($this->createLink('projectstory', 'linkStory', "project=$projectID"), $lang->execution->linkStory). "</li>";
-            if(common::hasPriv('projectstory', 'importPlanStories')) echo '<li>' . html::a('#linkStoryByPlan', $lang->execution->linkStoryByPlan, '', 'data-toggle="modal"') . "</li>";
+            echo "<button type='button' class='btn btn-primary dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>";
+            echo "<ul class='dropdown-menu pull-right'>";
+            echo '<li>' . html::a($this->createLink('projectstory', 'linkStory', "project=$projectID"), $lang->execution->linkStory). "</li>";
+            echo '<li>' . html::a('#linkStoryByPlan', $lang->execution->linkStoryByPlan, '', 'data-toggle="modal"') . "</li>";
             echo '</ul>';
         }
     }
     ?>
-    </div>
     <?php endif;?>
+    </div>
   </div>
   <?php endif;?>
 </div>