From 46bba7775ec50855410a9ada5b8c11368a1fba1c Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Wed, 28 Sep 2022 02:50:03 +0000
Subject: [PATCH 1/3] * Fix bug#27408.

---
 module/release/control.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/release/control.php b/module/release/control.php
index 7665c69c11..4bc2e24adf 100644
--- a/module/release/control.php
+++ b/module/release/control.php
@@ -81,7 +81,7 @@ class release extends control
             return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('view', "releaseID=$releaseID")));
         }
 
-        $builds         = $this->loadModel('build')->getBuildPairs($productID, $branch, 'notrunk|withbranch', 0, 'execution', false);
+        $builds         = $this->loadModel('build')->getBuildPairs($productID, $branch, 'notrunk|withbranch', 0, 'execution', '', false);
         $releasedBuilds = $this->release->getReleasedBuilds($productID, $branch);
         foreach($releasedBuilds as $build) unset($builds[$build]);
         unset($builds['trunk']);
@@ -140,7 +140,7 @@ class release extends control
         $this->commonAction($release->product, $release->branch);
         $build = $this->build->getById($release->build);
 
-        $builds         = $this->loadModel('build')->getBuildPairs($release->product, $release->branch, 'notrunk|withbranch', 0, 'execution', $release->build, false);
+        $builds         = $this->loadModel('build')->getBuildPairs($release->product, $release->branch, 'notrunk|withbranch', $release->project, 'project', $release->build, false);
         $releasedBuilds = $this->release->getReleasedBuilds($release->product, $release->branch);
         foreach($releasedBuilds as $releasedBuild)
         {

From e65e3d81d9d7f5ea7dd703173c7f8d68f3052a00 Mon Sep 17 00:00:00 2001
From: wangzemei <wangzemei@easycorp.ltd>
Date: Wed, 28 Sep 2022 11:08:20 +0800
Subject: [PATCH 2/3] * fix select class bug about xuanxuan

---
 .../xuan/common/ext/view/header.xuanxuan.html.hook.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xuanxuan/extension/xuan/common/ext/view/header.xuanxuan.html.hook.php b/xuanxuan/extension/xuan/common/ext/view/header.xuanxuan.html.hook.php
index 805be1c840..46323568ca 100644
--- a/xuanxuan/extension/xuan/common/ext/view/header.xuanxuan.html.hook.php
+++ b/xuanxuan/extension/xuan/common/ext/view/header.xuanxuan.html.hook.php
@@ -26,7 +26,7 @@ $(function()
     const mainHeader = document.getElementById('mainHeader');
     if(!mainHeader) return;
     const style = window.getComputedStyle(mainHeader, null);
-    const color = window.getComputedStyle(document.querySelector('#navbar .nav>li:not(.active)>a'), null).color;
+    const color = window.getComputedStyle(document.querySelector('#userMenu .nav>li:not(.active)>a'), null).color;
     const clientHeaderStyle = {windowControlBtnColor: color, background: style.background, color: color};
     window.parent.appHeaderStyleUpdated = true;
     window.open('xxc://setAppHeaderStyle/zentao-integrated/' + encodeURIComponent(JSON.stringify(clientHeaderStyle)), '_blank');

From 85685c774d091ecf8893e1fafc13ed3993d83988 Mon Sep 17 00:00:00 2001
From: wangzemei <wangzemei@easycorp.ltd>
Date: Wed, 28 Sep 2022 11:27:19 +0800
Subject: [PATCH 3/3] * fix xuanxuan css

---
 .../xuan/common/ext/view/header.xuanxuan.html.hook.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xuanxuan/extension/xuan/common/ext/view/header.xuanxuan.html.hook.php b/xuanxuan/extension/xuan/common/ext/view/header.xuanxuan.html.hook.php
index 46323568ca..aa222bcd5e 100644
--- a/xuanxuan/extension/xuan/common/ext/view/header.xuanxuan.html.hook.php
+++ b/xuanxuan/extension/xuan/common/ext/view/header.xuanxuan.html.hook.php
@@ -26,7 +26,7 @@ $(function()
     const mainHeader = document.getElementById('mainHeader');
     if(!mainHeader) return;
     const style = window.getComputedStyle(mainHeader, null);
-    const color = window.getComputedStyle(document.querySelector('#userMenu .nav>li:not(.active)>a'), null).color;
+    const color = window.getComputedStyle(document.querySelector('#navbar .nav>li:not(.active)>a, #userMenu .nav>li:not(.active)>a'), null).color;
     const clientHeaderStyle = {windowControlBtnColor: color, background: style.background, color: color};
     window.parent.appHeaderStyleUpdated = true;
     window.open('xxc://setAppHeaderStyle/zentao-integrated/' + encodeURIComponent(JSON.stringify(clientHeaderStyle)), '_blank');