From e7920e73b4a42e2baf3f98054ce5cf3bfa20b426 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=8D=8E=E4=BC=9F?= <sunhuawei@easycorp.ltd>
Date: Fri, 25 Feb 2022 08:38:25 +0800
Subject: [PATCH] *

---
 module/execution/control.php         | 9 ++++-----
 module/execution/view/story.html.php | 3 ++-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index 79baf197bf..eda3ab2f0e 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -815,13 +815,12 @@ class execution extends control
         $showModule  = !empty($this->config->datatable->executionStory->showModule) ? $this->config->datatable->executionStory->showModule : '';
         $modulePairs = $showModule ? $this->tree->getModulePairs($type == 'byproduct' ? $param : 0, 'story', $showModule) : array();
 
-        if($param)
-        $this->session->set('executionStoryBrowseParam', $param);
 
-        if(isset($_GET['param'])) $isAllProduct = $param;
-        else $isAllProduct = $this->session->executionStoryBrowseParam;
+        if($param) $this->session->set('executionStoryBrowseParam', $param ? false : true);
+        $isAllProduct = true;
+        if($this->cookie->storyProductParam) $isAllProduct = $this->session->executionStoryBrowseParam;
+        if(isset($_GET['param'])) $isAllProduct = $param ? false : true; /* Assign. */
 
-        /* Assign. */
         $this->view->title             = $title;
         $this->view->position          = $position;
         $this->view->productID         = $productID;
diff --git a/module/execution/view/story.html.php b/module/execution/view/story.html.php
index bf28419d98..9f9473bfc8 100644
--- a/module/execution/view/story.html.php
+++ b/module/execution/view/story.html.php
@@ -1,4 +1,5 @@
 <?php
+a($this->cookie->storyProductParam);
 /**
  * The story view file of execution module of ZenTaoPMS.
  *
@@ -86,7 +87,7 @@
 
             if($common::hasPriv('story', 'create') and common::hasPriv('story', 'batchCreate'))
             {
-                if($isAllProduct != 0 || count($products) == 1) echo "<button type='button' class='btn btn-secondary dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>";
+                if($isAllProduct or count($products) == 1) 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>';