From deeced3e140e5c2e26c45d8c9daa50de5b071a5a Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Thu, 31 Mar 2022 16:04:41 +0800
Subject: [PATCH 1/2] * Fix bug #21307.

---
 module/execution/model.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/execution/model.php b/module/execution/model.php
index 5b1bcd5d27..c5594930ae 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -1162,6 +1162,7 @@ class executionModel extends model
         {
             return $this->dao->select('*, IF(INSTR(" done,closed", status) < 2, 0, 1) AS isDone')->from(TABLE_EXECUTION)
                 ->where('deleted')->eq(0)
+                ->andWhere('vision')->eq($this->config->vision)
                 ->beginIF($type == 'all')->andWhere('type')->in('sprint,stage,kanban')->fi()
                 ->beginIF($type != 'all')->andWhere('type')->eq($type)->fi()
                 ->beginIF($projectID)->andWhere('project')->eq($projectID)->fi()

From f8981467e43424b73995ba96db000e945a4c373b Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Thu, 31 Mar 2022 16:44:45 +0800
Subject: [PATCH 2/2] * Fix bug #19714.

---
 module/project/view/bug.html.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/module/project/view/bug.html.php b/module/project/view/bug.html.php
index 887cfd9180..10461b58c3 100644
--- a/module/project/view/bug.html.php
+++ b/module/project/view/bug.html.php
@@ -18,7 +18,6 @@
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
     <?php
-    $productID = $productID == 0 ? key($this->product->getProductPairsByProject($project->id)) : $productID;
     $buildName = $build ? " <span class='label label-danger'>Build:{$build->name}</span>" : '';
     echo html::a($this->inlink('bug', "projectID={$project->id}&productID={$productID}&orderBy=status,id_desc&build=$buildID&type=all"), "<span class='text'>{$lang->bug->allBugs}</span>" . ($type == 'all' ? " <span class='label label-light label-badge'>{$pager->recTotal}</span>$buildName" : ''), '', "id='allTab' class='btn btn-link" . ('all' == $type ? ' btn-active-text' : '') . "'");
     echo html::a($this->inlink('bug', "projectID={$project->id}&productID={$productID}&orderBy=status,id_desc&build=$buildID&type=unresolved"), "<span class='text'>{$lang->bug->unResolved}</span>" . ($type == 'unresolved' ? " <span class='label label-light label-badge'>{$pager->recTotal}</span>$buildName" : ''), '', "id='unresolvedTab' class='btn btn-link" . ('unresolved' == $type ? ' btn-active-text' : '') . "'");