From 7527cceae56d970a538e8b2bac76e119bf797746 Mon Sep 17 00:00:00 2001 From: dingguodong Date: Mon, 22 Apr 2024 15:01:27 +0800 Subject: [PATCH] * Finish task#116509. Simplify the creatation of the Merge Request. --- module/mr/ui/create.html.php | 43 ++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/module/mr/ui/create.html.php b/module/mr/ui/create.html.php index 525ccd9f4d..b4d2c1e713 100644 --- a/module/mr/ui/create.html.php +++ b/module/mr/ui/create.html.php @@ -58,39 +58,38 @@ formPanel set::name('hostID'), set::value($repo->gitService) ), - formRow + formGroup ( - formGroup - ( - set::width('1/2'), - set::required(true), - set::label($lang->mr->sourceProject), - set::name('sourceProject'), - set::id('sourceProject'), - set::items($projectItem) - ), - formGroup - ( - set::labelWidth($app->clientLang == 'zh-cn' ? '6em' : '9em'), - set::required(true), - set::label($lang->mr->sourceBranch), - set::name('sourceBranch'), - set::items(array()) - ) + set::width('1/2'), + set::readonly(true), + set::label($lang->mr->sourceProject), + set::name('sourceProject'), + set::id('sourceProject'), + set::items($projectItem), + set::value($repo->id) + ), + formGroup + ( + setClass('hidden'), + set::name('targetProject'), + set::id('targetProject'), + set::items($projectItem), + set::value($repo->id) ), formRow ( formGroup ( set::width('1/2'), + set::labelWidth($app->clientLang == 'zh-cn' ? '6em' : '9em'), set::required(true), - set::label($lang->mr->targetProject), - set::id('targetProject'), - set::name('targetProject'), - set::items($projectItem) + set::label($lang->mr->sourceBranch), + set::name('sourceBranch'), + set::items(array()) ), formGroup ( + set::width('1/2'), set::labelWidth($app->clientLang == 'zh-cn' ? '6em' : '9em'), set::required(true), set::label($lang->mr->targetBranch),