From c69ee0ff77c91dabdc08b77979fd0771aeffc9ad Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Wed, 6 Sep 2023 14:33:19 +0800 Subject: [PATCH] * Fix bug #38299. --- module/mr/ui/diff.html.php | 2 ++ module/mr/ui/link.html.php | 2 ++ module/mr/ui/view.html.php | 3 +-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/module/mr/ui/diff.html.php b/module/mr/ui/diff.html.php index a7c7035e02..992314fe49 100644 --- a/module/mr/ui/diff.html.php +++ b/module/mr/ui/diff.html.php @@ -10,6 +10,8 @@ declare(strict_types=1); */ namespace zin; +dropmenu(set::objectID($MR->repoID), set::tab('repo')); + detailHeader ( to::title diff --git a/module/mr/ui/link.html.php b/module/mr/ui/link.html.php index 54b152a9e9..7090391e19 100644 --- a/module/mr/ui/link.html.php +++ b/module/mr/ui/link.html.php @@ -14,6 +14,8 @@ jsVar('type', $type); jsVar('orderBy', $orderBy); jsVar('sortLink', createLink('mr', 'link', "MRID={$MR->id}&type={type}&orderBy={orderBy}&recTotal=&recPerPage=&pageID=")); +dropmenu(set::objectID($MR->repoID), set::tab('repo')); + $actionMenu = array(); $actionMenu['title'] = $lang->actions; $actionMenu['type'] = 'actions'; diff --git a/module/mr/ui/view.html.php b/module/mr/ui/view.html.php index dc4611f1e9..fed907b5de 100644 --- a/module/mr/ui/view.html.php +++ b/module/mr/ui/view.html.php @@ -10,8 +10,7 @@ declare(strict_types=1); */ namespace zin; -$repoName = $this->dao->select('name')->from(TABLE_REPO)->where('id')->eq($MR->repoID)->fetch('name'); -dropmenu(set::objectID($MR->repoID), set::text($repoName), set::tab('repo')); +dropmenu(set::objectID($MR->repoID), set::tab('repo')); $hasNoConflict = $MR->synced === '1' ? $rawMR->has_conflicts : (bool)$MR->hasNoConflict; $sourceDisabled = ($MR->status == 'merged' && $MR->removeSourceBranch == '1') ? 'disabled' : '';