From 890532c727c52e95dc0b3799f780abc3b08ea3f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=8D=8E=E4=BC=9F?= <sunhuawei@easycorp.ltd>
Date: Thu, 24 Feb 2022 15:08:20 +0800
Subject: [PATCH] *Fix bug #19959 #19963.

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

diff --git a/module/execution/control.php b/module/execution/control.php
index ec1ddb6b24..79baf197bf 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -818,11 +818,8 @@ class execution extends control
         if($param)
         $this->session->set('executionStoryBrowseParam', $param);
 
-        a($param);
-        if(isset($_GET['param']))
-        $isAllProduct = $param;
-        else
-        $isAllProduct = $this->session->executionStoryBrowseParam;
+        if(isset($_GET['param'])) $isAllProduct = $param;
+        else $isAllProduct = $this->session->executionStoryBrowseParam;
 
         /* Assign. */
         $this->view->title             = $title;
@@ -849,7 +846,7 @@ class execution extends control
         $this->view->branchGroups      = $branchGroups;
         $this->view->canBeChanged      = common::canModify('execution', $execution); // Determines whether an object is editable.
         $this->view->showBranch        = $showBranch;
-a('param:'.$this->view->param.'products:'.count($products));
+
         $this->display();
     }
 
diff --git a/module/execution/view/story.html.php b/module/execution/view/story.html.php
index 0892b363a2..bf28419d98 100644
--- a/module/execution/view/story.html.php
+++ b/module/execution/view/story.html.php
@@ -86,7 +86,7 @@
 
             if($common::hasPriv('story', 'create') and common::hasPriv('story', 'batchCreate'))
             {
-                if($isAllProject != 0 || count($products) == 1) echo "<button type='button' class='btn btn-secondary dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>";
+                if($isAllProduct != 0 || 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>';
diff --git a/module/tree/model.php b/module/tree/model.php
index b8d9e1b586..bde165aa6e 100644
--- a/module/tree/model.php
+++ b/module/tree/model.php
@@ -818,7 +818,7 @@ class treeModel extends model
             $projectProductLink   = helper::createLink('projectstory', 'story', "projectID=$rootID&productID=$id&branch=all");
             $executionProductLink = helper::createLink('execution', 'story', "executionID=$rootID&ordery=&status=byProduct&praram=$id");
             $link = $this->app->rawModule == 'projectstory' ? $projectProductLink : $executionProductLink;
-            if($productNum > 1) $menu .= "<li>" . html::a($link, $product, '_self', "id='product$id'");
+            if($productNum > 1) $menu .= "<li>" . html::a($link, $product, '_self', "id='product$id' title=$product");
 
             /* tree menu. */
             $tree = '';