From 645f880f825cdb8078564ec6efe6705b0176e776 Mon Sep 17 00:00:00 2001
From: hufangzhou <746775970@qq.com>
Date: Wed, 10 Mar 2021 14:42:15 +0800
Subject: [PATCH] * Adjust the code.

---
 module/product/view/browse.html.php | 4 +++-
 module/story/control.php            | 2 +-
 module/story/view/create.html.php   | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index b703179e6f..1e31d8b261 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -155,6 +155,7 @@ $isProjectStory = $this->app->rawModule == 'projectstory';
         }
         ?>
         </li>
+        <?php if(!empty($productID)): ?>
         <?php $batchDisabled = common::hasPriv('story', 'batchCreate') ? '' : "class='disabled'";?>
         <li <?php echo $batchDisabled;?>>
         <?php
@@ -163,6 +164,7 @@ $isProjectStory = $this->app->rawModule == 'projectstory';
           echo html::a($batchLink, $lang->story->batchCreate, '', "data-group='$openApp'");
         ?>
         </li>
+        <?php endif;?>
       </ul>
     </div>
     <?php $isShow = $isProjectStory ? '' : "style='display: none;'";?>
@@ -180,7 +182,7 @@ $isProjectStory = $this->app->rawModule == 'projectstory';
         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={$this->session->PRJ}"), $lang->execution->linkStory). "</li>";
-        if(common::hasPriv('project', 'importPlanStories')) echo '<li>' . html::a('#linkStoryByPlan', $lang->execution->linkStoryByPlan, '', 'data-toggle="modal"') . "</li>";
+        if(common::hasPriv('project', 'importPlanStories') and !empty($productID)) echo '<li>' . html::a('#linkStoryByPlan', $lang->execution->linkStoryByPlan, '', 'data-toggle="modal"') . "</li>";
         echo '</ul>';
     }
     ?>
diff --git a/module/story/control.php b/module/story/control.php
index 8ae0d131f2..b687e842c2 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -293,7 +293,7 @@ class story extends control
         $this->view->position[]       = html::a($this->createLink('product', 'browse', "product=$productID&branch=$branch"), $product->name);
         $this->view->position[]       = $this->lang->story->common;
         $this->view->position[]       = $this->lang->story->create;
-        $this->view->products         = $products;
+        $this->view->products         = array('' => '') + $products;
         $this->view->users            = $users;
         $this->view->moduleID         = $moduleID ? $moduleID : (int)$this->cookie->lastStoryModule;
         $this->view->moduleOptionMenu = $moduleOptionMenu;
diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php
index 9ee2c8b719..82b24f73f3 100644
--- a/module/story/view/create.html.php
+++ b/module/story/view/create.html.php
@@ -39,7 +39,7 @@
               <?php if($product->type != 'normal'):?>
               <div class='input-group'>
               <?php endif;?>
-              <?php echo html::select('product', $products, $productID, "onchange='loadProduct(this.value);' class='form-control chosen control-product'");?>
+              <?php echo html::select('product', $products, empty($productID) ? '' : $productID, "onchange='loadProduct(this.value);' class='form-control chosen control-product'");?>
               <?php if($product->type != 'normal'):?>
               <span class='input-group-addon fix-border fix-padding'></span>
               <?php echo html::select('branch', $branches, $branch, "onchange='loadBranch();' class='form-control chosen control-branch'");?>