diff --git a/module/build/css/common.ui.css b/module/build/css/common.ui.css index 6261bde4aa..b4ef778ab2 100644 --- a/module/build/css/common.ui.css +++ b/module/build/css/common.ui.css @@ -1 +1,2 @@ .items-center {align-items: center !important;} +.pl-4 {padding-left: 1rem !important;} diff --git a/module/build/ui/create.html.php b/module/build/ui/create.html.php index f5aa2c45b4..a90156faaf 100644 --- a/module/build/ui/create.html.php +++ b/module/build/ui/create.html.php @@ -119,7 +119,7 @@ formPanel formGroup ( set::width('1/2'), - setClass('ml-4 items-center'), + setClass('pl-4 items-center'), icon('help') ), ), diff --git a/module/build/ui/edit.html.php b/module/build/ui/edit.html.php new file mode 100644 index 0000000000..6c662eeb1f --- /dev/null +++ b/module/build/ui/edit.html.php @@ -0,0 +1,185 @@ + + * @package build + * @link https://www.zentao.net + */ +namespace zin; + +jsVar('productGroups', $productGroups); +jsVar('projectID', $build->project); +jsVar('executionID', $build->execution); +jsVar('oldBranch', $oldBranch); +jsVar('builds', $build->builds); +jsVar('buildID', $build->id); +$productRow = ''; +if(!$hidden) +{ + $productRow = formRow( + formGroup + ( + set::width('1/2'), + set::name('product'), + set::label($lang->build->product), + set::value($build->product), + set::items($products), + set::required(true), + set::disabled($build->stories || $build->bugs || $testtaskID), + on::change('loadBranches') + ), + $build->stories || $build->bugs || $testtaskID ? formGroup + ( + set::width('1/2'), + setClass('items-center pl-4'), + $lang->build->notice->changeProduct + ) : '', + ); +} + +$executionRow = ''; +$buildRow = ''; +if(!$build->execution) +{ + $buildRow = formRow( + formGroup + ( + set::width('1/2'), + set::name('builds[]'), + set::label($lang->build->builds), + set::items($builds), + set::value($build->builds), + set::disabled(!empty($testtaskID)), + set::placeholder($lang->build->placeholder->multipleSelect), + ), + formGroup + ( + set::width('1/2'), + setClass('items-center pl-4'), + $testtaskID ? $lang->build->notice->changeBuilds : $lang->build->notice->autoRelation + ) + ); +} +elseif(!empty($multipleProject)) +{ + $executionRow = formRow( + formGroup + ( + set::width('1/2'), + set::name('execution'), + set::label($executionType ? $lang->build->executionAB : $lang->build->execution), + set::value($build->execution), + set::items($executions), + set::disabled(!empty($testtaskID)), + set::required(true), + ), + $testtaskID ? formGroup( + set::width('1/2'), + setClass('items-center pl-4'), + $lang->build->notice->changeExecution + ) : '', + ); +} + +if(empty($product)) $product = new stdclass(); +$productType = zget($product, 'type', 'normal'); +$productBranches = zget($product, 'branches', array()); + +formPanel +( + set::title($lang->build->edit), + $productRow, + formRow + ( + setClass(!empty($product) && $product->type != 'normal' && !empty($build->execution) ? '' : 'hidden'), + formGroup + ( + set::width('1/2'), + set::name('branch[]'), + set::label($lang->product->branchName[$productType]), + set::value($build->branch), + set::items($branchTagOption), + ) + ), + !$build->execution ? $buildRow : $executionRow, + formRow + ( + formGroup + ( + set::width('1/2'), + set::name('name'), + set::label($lang->build->nameAB), + set::value($build->name), + ), + ), + formRow + ( + formGroup + ( + set::width('1/2'), + set::name('builder'), + set::label($lang->build->builder), + set::value($build->builder), + set::items($users), + ), + ), + formRow + ( + formGroup + ( + set::width('1/2'), + set::name('date'), + set::label($lang->build->date), + set::control('date'), + set::value($build->date), + ), + ), + formRow + ( + formGroup + ( + set::name('scmPath'), + set::label($lang->build->scmPath), + set::placeholder($lang->build->placeholder->scmPath), + set::value($build->scmPath), + ), + ), + formRow + ( + formGroup + ( + set::name('filePath'), + set::label($lang->build->filePath), + set::placeholder($lang->build->placeholder->filePath), + set::value($build->filePath), + ), + ), + formRow + ( + formGroup + ( + set::name('files[]'), + set::label($lang->build->files), + set::control('file') + ), + ), + formRow + ( + formGroup + ( + set::label($lang->build->desc), + editor + ( + set::name('desc'), + set::value(htmlSpecialString($build->desc)), + set::rows('10'), + ) + ), + ) +); + +/* ====== Render page ====== */ +render();