From 6f890203044d602dbcc01afeeaec58edc6aed675 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Mon, 13 Nov 2023 16:42:40 +0800 Subject: [PATCH] * Remove `,` at the end of row in the lastest children in build. --- module/build/ui/create.html.php | 60 +++++++++++++++--------------- module/build/ui/edit.html.php | 34 ++++++++--------- module/build/ui/linkbug.html.php | 4 +- module/build/ui/linkstory.html.php | 4 +- module/build/ui/view.html.php | 26 ++++++------- 5 files changed, 64 insertions(+), 64 deletions(-) diff --git a/module/build/ui/create.html.php b/module/build/ui/create.html.php index d0166efe68..8c73befc7d 100644 --- a/module/build/ui/create.html.php +++ b/module/build/ui/create.html.php @@ -32,8 +32,8 @@ if($app->tab == 'project' && !empty($multipleProject)) set::items($lang->build->isIntegrated), set::value('no'), set::inline(true) - ), - ), + ) + ) ); } @@ -54,8 +54,8 @@ if(!empty($multipleProject)) set::items($executions), set::required(true), on::change('loadProducts') - ), - ), + ) + ) ); } @@ -91,8 +91,8 @@ if(!$hidden) set::value('no'), set::inline(true), on::click('onShowArtifactRepo') - ), - ), + ) + ) ); $artifactRepoRow[] = formRow ( @@ -103,8 +103,8 @@ if(!$hidden) set::label($lang->artifactrepo->repoName), set::name('artifactRepoID'), set::items(array()), - on::change('onChangeArtifactRepo'), - ), + on::change('onChangeArtifactRepo') + ) ); } else @@ -114,11 +114,11 @@ if(!$hidden) setClass('items-center'), set::id('productBox'), set::label($lang->build->product), - html(sprintf($lang->build->noProduct, helper::createLink('execution', 'manageproducts', "executionID={$executionID}", '', true), $app->tab)), + html(sprintf($lang->build->noProduct, helper::createLink('execution', 'manageproducts', "executionID={$executionID}", '', true), $app->tab)) ); } $productRow = formRow( - $productBox, + $productBox ); } @@ -144,7 +144,7 @@ formPanel set::name('branch[]'), set::value(key($productBranches)), set::items($branches), - set::multiple(true), + set::multiple(true) ) ) ), @@ -161,7 +161,7 @@ formPanel set::id('builds'), set::name('builds[]'), set::items(array()), - set::multiple(true), + set::multiple(true) ) ), formGroup @@ -171,9 +171,9 @@ formPanel icon( 'help', set('data-toggle', 'tooltip'), - set('id', 'tooltipHover'), - ), - ), + set('id', 'tooltipHover') + ) + ) ), formRow ( @@ -181,7 +181,7 @@ formPanel ( set::width('1/2'), set::name('name'), - set::label($lang->build->nameAB), + set::label($lang->build->nameAB) ), $lastBuild ? formGroup ( @@ -194,10 +194,10 @@ formPanel div ( setClass('help-block'), - html(' ' . $lang->build->last . ': ' . $lastBuild->name . ''), - ), + html(' ' . $lang->build->last . ': ' . $lastBuild->name . '') + ) ) - ) : '', + ) : '' ), formRow ( @@ -207,8 +207,8 @@ formPanel set::name('builder'), set::label($lang->build->builder), set::value($app->user->account), - set::items($users), - ), + set::items($users) + ) ), formRow ( @@ -218,8 +218,8 @@ formPanel set::name('date'), set::label($lang->build->date), set::control('date'), - set::value(helper::today()), - ), + set::value(helper::today()) + ) ), formRow ( @@ -227,8 +227,8 @@ formPanel ( set::name('scmPath'), set::label($lang->build->scmPath), - set::placeholder($lang->build->placeholder->scmPath), - ), + set::placeholder($lang->build->placeholder->scmPath) + ) ), formRow ( @@ -236,8 +236,8 @@ formPanel ( set::name('filePath'), set::label($lang->build->filePath), - set::placeholder($lang->build->placeholder->filePath), - ), + set::placeholder($lang->build->placeholder->filePath) + ) ), formRow ( @@ -245,7 +245,7 @@ formPanel ( set::label($lang->build->files), upload() - ), + ) ), formRow ( @@ -255,14 +255,14 @@ formPanel editor ( set::name('desc'), - set::rows('10'), + set::rows('10') ) ), formGroup ( setClass('hidden'), set::name('project'), - set::value($projectID), + set::value($projectID) ) ) ); diff --git a/module/build/ui/edit.html.php b/module/build/ui/edit.html.php index cd2b297f92..e1bd0707d6 100644 --- a/module/build/ui/edit.html.php +++ b/module/build/ui/edit.html.php @@ -37,7 +37,7 @@ if(!$hidden) set::width('1/2'), setClass('items-center pl-4'), $lang->build->notice->changeProduct - ) : '', + ) : '' ); } @@ -57,7 +57,7 @@ if(!$build->execution) set::value($build->builds), set::disabled(!empty($testtaskID)), set::placeholder($lang->build->placeholder->multipleSelect), - set::multiple(true), + set::multiple(true) ) ), formGroup @@ -79,13 +79,13 @@ elseif(!empty($multipleProject)) set::value($build->execution), set::items($executions), set::disabled(!empty($testtaskID)), - set::required(true), + set::required(true) ), $testtaskID ? formGroup( set::width('1/2'), setClass('items-center pl-4'), $lang->build->notice->changeExecution - ) : '', + ) : '' ); } @@ -109,7 +109,7 @@ formPanel set::name('branch[]'), set::value($build->branch), set::items($branchTagOption), - set::multiple(true), + set::multiple(true) ) ) ), @@ -122,7 +122,7 @@ formPanel set::name('name'), set::label($lang->build->nameAB), set::value($build->name), - ), + ) ), formRow ( @@ -132,8 +132,8 @@ formPanel set::name('builder'), set::label($lang->build->builder), set::value($build->builder), - set::items($users), - ), + set::items($users) + ) ), formRow ( @@ -143,8 +143,8 @@ formPanel set::name('date'), set::label($lang->build->date), set::control('date'), - set::value($build->date), - ), + set::value($build->date) + ) ), formRow ( @@ -153,8 +153,8 @@ formPanel set::name('scmPath'), set::label($lang->build->scmPath), set::placeholder($lang->build->placeholder->scmPath), - set::value($build->scmPath), - ), + set::value($build->scmPath) + ) ), formRow ( @@ -163,8 +163,8 @@ formPanel set::name('filePath'), set::label($lang->build->filePath), set::placeholder($lang->build->placeholder->filePath), - set::value($build->filePath), - ), + set::value($build->filePath) + ) ), formRow ( @@ -172,7 +172,7 @@ formPanel ( set::label($lang->build->files), upload() - ), + ) ), formRow ( @@ -182,9 +182,9 @@ formPanel editor ( set::name('desc'), - html($build->desc), + html($build->desc) ) - ), + ) ) ); diff --git a/module/build/ui/linkbug.html.php b/module/build/ui/linkbug.html.php index 71dc49ff93..0cd9f9b102 100644 --- a/module/build/ui/linkbug.html.php +++ b/module/build/ui/linkbug.html.php @@ -46,7 +46,7 @@ dtable 'btnType' => 'primary', 'className' => 'size-sm linkObjectBtn', 'data-type' => 'bug', - 'data-url' => createLink($buildModule, 'linkBug', "buildID=$build->id&browseType=$browseType¶m=$param"), + 'data-url' => createLink($buildModule, 'linkBug', "buildID=$build->id&browseType=$browseType¶m=$param") )) )), set::footer(array('checkbox', 'toolbar', array('html' => html::a(createLink($buildModule, 'view', "buildID=$build->id&type=bug"), $lang->goback, '', "class='btn size-sm'")), 'flex', 'pager')), @@ -55,7 +55,7 @@ dtable 'recPerPage' => $pager->recPerPage, 'recTotal' => $pager->recTotal, 'linkCreator' => helper::createLink($buildModule, 'view', "buildID={$build->id}&type=bug&link=true¶m=" . helper::safe64Encode("&browseType={$browseType}¶m={$param}") . "&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={recPerPage}&page={page}") - ))), + ))) ); render(); diff --git a/module/build/ui/linkstory.html.php b/module/build/ui/linkstory.html.php index d9ef05c53a..c8a1a5f98c 100644 --- a/module/build/ui/linkstory.html.php +++ b/module/build/ui/linkstory.html.php @@ -38,7 +38,7 @@ dtable 'btnType' => 'primary', 'className' => 'size-sm linkObjectBtn', 'data-type' => 'story', - 'data-url' => createLink($buildModule, 'linkStory', "buildID={$build->id}&browseType=$browseType¶m=$param"), + 'data-url' => createLink($buildModule, 'linkStory', "buildID={$build->id}&browseType=$browseType¶m=$param") )))), set::footer(array('checkbox', 'toolbar', array('html' => html::a(helper::createLink($buildModule, 'view', "buildID=$build->id&type=story"). "#app={$app->tab}", $lang->goback, '', "class='btn size-sm'")), 'flex', 'pager')), set::footPager(usePager(array @@ -46,7 +46,7 @@ dtable 'recPerPage' => $pager->recPerPage, 'recTotal' => $pager->recTotal, 'linkCreator' => helper::createLink($buildModule, 'view', "buildID={$build->id}&type=story&link=true¶m=" . helper::safe64Encode("&browseType={$browseType}¶m={$param}") . "&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={recPerPage}&page={page}") - ))), + ))) ); h::js diff --git a/module/build/ui/view.html.php b/module/build/ui/view.html.php index 0dee5395f2..021fad58a7 100644 --- a/module/build/ui/view.html.php +++ b/module/build/ui/view.html.php @@ -47,10 +47,10 @@ detailHeader set::level(2), set::text($build->name), set::textClass('text-primary'), - set::idClass('id-label'), - ), + set::idClass('id-label') + ) ), - set::items($buildItems), + set::items($buildItems) ) ), !empty($menus) ? to::suffix(btnGroup(set::items($menus))) : null @@ -118,7 +118,7 @@ detailBody div ( setClass('tabnActions'), - !common::hasPriv($buildModule, 'linkStory') ? null : btn(set::text($lang->build->linkStory), setClass('primary link'), set::icon('link'), set::onclick('showLink(this)'), set('data-type', 'story'), set('data-linkurl', createLink($buildModule, 'linkStory', "buildID={$build->id}" . (($link == 'true' && $type == 'story') ? $decodeParam : "&browseType=¶m=")))), + !common::hasPriv($buildModule, 'linkStory') ? null : btn(set::text($lang->build->linkStory), setClass('primary link'), set::icon('link'), set::onclick('showLink(this)'), set('data-type', 'story'), set('data-linkurl', createLink($buildModule, 'linkStory', "buildID={$build->id}" . (($link == 'true' && $type == 'story') ? $decodeParam : "&browseType=¶m=")))) ), dtable ( @@ -134,7 +134,7 @@ detailBody 'recPerPage' => $storyPager->recPerPage, 'recTotal' => $storyPager->recTotal, 'linkCreator' => helper::createLink($buildModule, 'view', "buildID={$build->id}&type=story&link={$link}¶m={$param}&orderBy={$orderBy}&recTotal={$storyPager->recTotal}&recPerPage={recPerPage}&page={page}") - ))), + ))) ) ), @@ -148,7 +148,7 @@ detailBody div ( setClass('tabnActions'), - !common::hasPriv($buildModule, 'linkBug') ? null : btn(set::text($lang->build->linkBug), setClass('primary link'), set::icon('link'), set::onclick('showLink(this)'), set('data-type', 'bug'), set('data-linkurl', createLink($buildModule, 'linkBug', "buildID={$build->id}" . (($link == 'true' && $type == 'bug') ? $decodeParam : "&browseType=¶m=")))), + !common::hasPriv($buildModule, 'linkBug') ? null : btn(set::text($lang->build->linkBug), setClass('primary link'), set::icon('link'), set::onclick('showLink(this)'), set('data-type', 'bug'), set('data-linkurl', createLink($buildModule, 'linkBug', "buildID={$build->id}" . (($link == 'true' && $type == 'bug') ? $decodeParam : "&browseType=¶m=")))) ), dtable ( @@ -164,7 +164,7 @@ detailBody 'recPerPage' => $bugPager->recPerPage, 'recTotal' => $bugPager->recTotal, 'linkCreator' => helper::createLink($buildModule, 'view', "buildID={$build->id}&type=bug&link={$link}¶m={$param}&orderBy={$orderBy}&recTotal={$bugPager->recTotal}&recPerPage={recPerPage}&page={page}") - ))), + ))) ) ), @@ -186,7 +186,7 @@ detailBody 'recPerPage' => $generatedBugPager->recPerPage, 'recTotal' => $generatedBugPager->recTotal, 'linkCreator' => helper::createLink($buildModule, 'view', "buildID={$build->id}&type=generatedBug&link={$link}¶m={$param}&orderBy={$orderBy}&recTotal={$generatedBugPager->recTotal}&recPerPage={recPerPage}&page={page}") - ))), + ))) ) ), @@ -241,7 +241,7 @@ detailBody $build->scmPath, set('href', $build->scmPath), set('target', '_blank'), - set('rel', 'nooperner noreferrer'), + set('rel', 'nooperner noreferrer') ) ), item @@ -252,22 +252,22 @@ detailBody $build->filePath, set('href', $build->filePath), set('target', '_blank'), - set('rel', 'nooperner noreferrer'), + set('rel', 'nooperner noreferrer') ) ), item ( set::name($lang->build->desc), html($build->desc) - ), + ) ), $build->files ? h::hr(set::className('mt-6')) : null, section ( $build->files ? fileList ( - set::files($build->files), - ) : null, + set::files($build->files) + ) : null ), h::hr(set::className('mt-6')), history()