From f499659a7da32777b4f3aa819ff27ff49e0a77d2 Mon Sep 17 00:00:00 2001 From: sunguangming Date: Tue, 18 Jun 2024 05:37:49 +0000 Subject: [PATCH] * [bug#51277,done,1h] modify saved query url. --- module/execution/ui/task.html.php | 2 ++ module/testcase/ui/header.html.php | 2 ++ 2 files changed, 4 insertions(+) diff --git a/module/execution/ui/task.html.php b/module/execution/ui/task.html.php index 3de597feac..3bfa88eb66 100644 --- a/module/execution/ui/task.html.php +++ b/module/execution/ui/task.html.php @@ -14,10 +14,12 @@ namespace zin; /* zin: Define the set::module('task') feature bar on main menu. */ if(empty($features['story'])) unset($lang->execution->featureBar['task']['needconfirm']); +$queryMenuLink = createLink('execution', 'task', "executionID={$execution->id}&status=bySearch¶m={queryID}"); featureBar ( set::current($browseType), set::linkParams("executionID={$execution->id}&status={key}¶m={$param}&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"), + set::queryMenuLinkCallback(array(fn($key) => str_replace('{queryID}', (string)$key, $queryMenuLink))), li(searchToggle(set::module('task'), set::open($browseType == 'bysearch'))) ); diff --git a/module/testcase/ui/header.html.php b/module/testcase/ui/header.html.php index 0d05caed83..879cf178d1 100644 --- a/module/testcase/ui/header.html.php +++ b/module/testcase/ui/header.html.php @@ -105,10 +105,12 @@ $browseLink = createLink('testcase', 'browse', $linkParams); if($app->tab == 'project') $browseLink = createLink('project', 'testcase', $linkParams); if($rawMethod == 'browseunits') $browseLink = createLink('testtask', 'browseUnits', "productID=$productID&browseType={key}"); +$queryMenuLink = createLink('testcase', 'browse', $projectParam . "productID=$productID&branch=$branch&browseType=bySearch¶m={queryID}"); featureBar ( set::linkParams($rawMethod == 'zerocase' || $rawMethod == 'browseunits' ? null : $linkParams), set::link($rawMethod == 'zerocase' || $rawMethod == 'browseunits' ? $browseLink : null), + set::queryMenuLinkCallback(array(fn($key) => str_replace('{queryID}', (string)$key, $queryMenuLink))), set::current($methodName == 'browse' ? $this->session->caseBrowseType : null), set::load($load), set::app($app->tab),