- + From 019bf42e4dd390b35e2d47c9e79e8c49b699449b Mon Sep 17 00:00:00 2001 From: sunguangming Date: Thu, 28 Jul 2022 13:10:11 +0800 Subject: [PATCH 10/40] * Fix bug #25814. --- module/project/control.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/project/control.php b/module/project/control.php index bbcfb82415..ea1903944f 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -1072,7 +1072,7 @@ class project extends control foreach($teamMembers as $key => $member) $memberPairs[$key] = $member->realname; /* Build the search form. */ - $actionURL = $this->createLink('project', 'bug', "projectID=$projectID&productID=$productID&orderBy=$orderBy&build=$build&type=bysearch&queryID=myQueryID"); + $actionURL = $this->createLink('project', 'bug', "projectID=$projectID&productID=$productID&branchID=$branchID&orderBy=$orderBy&build=$build&type=bysearch&queryID=myQueryID"); $this->loadModel('execution')->buildBugSearchForm($products, $queryID, $actionURL, 'project'); $showBranch = false; From c9753f5490594e4225b1a54c2ffab1cdf7ad4c27 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 28 Jul 2022 13:22:32 +0800 Subject: [PATCH 11/40] * Fix bug #25814. --- module/block/view/executionstatisticblock.html.php | 4 ++-- module/bug/model.php | 4 ++-- module/build/model.php | 2 +- module/tree/model.php | 3 ++- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/module/block/view/executionstatisticblock.html.php b/module/block/view/executionstatisticblock.html.php index 7a90a10d75..e3fdf063db 100644 --- a/module/block/view/executionstatisticblock.html.php +++ b/module/block/view/executionstatisticblock.html.php @@ -185,11 +185,11 @@ $(function()
- + - +
bug->allBugs;?> :totalBugs) ? 0 : html::a($this->createLink('execution', 'bug', "executionID={$execution->id}&productID=0&orderBy=status,id_desc&build=0&type=all"), $execution->totalBugs);?>totalBugs) ? 0 : html::a($this->createLink('execution', 'bug', "executionID={$execution->id}&productID=0&branch=0&orderBy=status,id_desc&build=0&type=all"), $execution->totalBugs);?>
bug->unResolved;?> :activeBugs) ? 0 : html::a($this->createLink('execution', 'bug', "executionID={$execution->id}&productID=0&orderBy=status,id_desc&build=0&type=unresolved"), $execution->activeBugs);?>activeBugs) ? 0 : html::a($this->createLink('execution', 'bug', "executionID={$execution->id}&productID=0&branch=0&orderBy=status,id_desc&build=0&type=unresolved"), $execution->activeBugs);?>