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) { 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..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('#navbar .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');