From 8a55e6ce6895da4e99c2db0a8259ee37a1a70153 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Wed, 25 Oct 2023 09:01:46 +0800
Subject: [PATCH] * Refactor button for the build list page.

---
 module/build/config.php          | 7 ++++---
 module/project/js/build.ui.js    | 4 ++--
 module/project/ui/build.html.php | 9 ++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/module/build/config.php b/module/build/config.php
index d0f246336a..77daf148c8 100644
--- a/module/build/config.php
+++ b/module/build/config.php
@@ -35,9 +35,10 @@ $config->build->actionList['linkStory']['url']  = helper::createLink('build', 'v
 $config->build->actionList['linkProjectStory'] = $config->build->actionList['linkStory'];
 $config->build->actionList['linkProjectStory']['url'] = helper::createLink('projectbuild', 'view', 'buildID={id}&type=story&link=true');
 
-$config->build->actionList['createTest']['icon'] = 'bullhorn';
-$config->build->actionList['createTest']['hint'] = $lang->build->createTest;
-$config->build->actionList['createTest']['url']  = helper::createLink('testtask', 'create', 'product={product}&execution={execution}&build={id}&projectID={project}');
+$config->build->actionList['createTest']['icon']     = 'bullhorn';
+$config->build->actionList['createTest']['hint']     = $lang->build->createTest;
+$config->build->actionList['createTest']['url']      = helper::createLink('testtask', 'create', 'product={product}&execution={execution}&build={id}&projectID={project}');
+$config->build->actionList['createTest']['data-app'] = $app->tab;
 
 $config->build->actionList['viewBug']['icon'] = 'bug';
 $config->build->actionList['viewBug']['hint'] = $lang->build->viewBug;
diff --git a/module/project/js/build.ui.js b/module/project/js/build.ui.js
index fe8e4920e6..69b89e12ca 100644
--- a/module/project/js/build.ui.js
+++ b/module/project/js/build.ui.js
@@ -52,9 +52,9 @@ window.renderCell = function(result, {col, row})
  * @access public
  * @return void
  */
-window.changeProduct = function()
+window.changeProduct = function(e)
 {
-    const link = changeProductLink.replace('{productID}', $(this).val());
+    const link = changeProductLink.replace('{productID}', $(e.target).val());
     loadPage(link);
 }
 
diff --git a/module/project/ui/build.html.php b/module/project/ui/build.html.php
index 2a6f25f191..dbfb15e186 100644
--- a/module/project/ui/build.html.php
+++ b/module/project/ui/build.html.php
@@ -14,8 +14,8 @@ $changeProductBox = '';
 if($project->hasProduct)
 {
     $changeProductBox = div(
-        set::className('select-product-box'),
-        select
+        setClass('select-product-box mx-2'),
+        picker
         (
             set::name('product'),
             set::value($productID),
@@ -43,9 +43,7 @@ toolbar
     !empty($createItem) ? item(set($createItem)) : null,
 );
 
-jsVar('orderBy', $orderBy);
 jsVar('projectID', $project->id);
-jsVar('sortLink', helper::createLink($app->rawModule, $app->rawMethod, "projectID={$project->id}&type={$type}&param={$param}&orderBy={orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"));
 jsVar('changeProductLink', helper::createLink($app->rawModule, $app->rawMethod, "projectID={$project->id}&type=product&param={productID}&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"));
 jsVar('scmPathTip', $lang->build->scmPath);
 jsVar('filePathTip', $lang->build->filePath);
@@ -57,7 +55,8 @@ dtable
     set::cols($config->build->dtable->fieldList),
     set::data($builds),
     set::plugins(array('cellspan')),
-    set::sortLink(jsRaw('createSortLink')),
+    set::orderBy($orderBy),
+    set::sortLink(createLink($app->rawModule, $app->rawMethod, "projectID={$project->id}&type={$type}&param={$param}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")),
     set::onRenderCell(jsRaw('window.renderCell')),
     set::getCellSpan(jsRaw('window.getCellSpan')),
     set::footPager(