* Remove , at the end of row in the lastest children in gitlab.

This commit is contained in:
liumengyi
2023-11-14 10:53:27 +08:00
parent eb3cc969eb
commit 44de2ad2ab
21 changed files with 61 additions and 61 deletions
+3 -3
View File
@@ -17,7 +17,7 @@ featureBar
(
to::leading(array(backBtn(set::icon('back'), set::className('secondary'), $lang->goback))),
set::current($type),
set::link($this->createLink('gitlab', 'binduser', "gitlabID=$gitlabID&type={key}")),
set::link($this->createLink('gitlab', 'binduser', "gitlabID=$gitlabID&type={key}"))
);
/* zin: Define the toolbar on main menu. */
@@ -55,9 +55,9 @@ form
array(
'text' => $lang->goback,
'btnType' => 'info',
'onClick' => jsRaw('() => {goBack()}'),
'onClick' => jsRaw('() => {goBack()}')
)
)
)),
))
)
);
+2 -2
View File
@@ -23,7 +23,7 @@ $tableData = initTableData($gitlabList, $config->gitlab->dtable->fieldList, $thi
toolbar
(
$canCreate ? item(set($createItem)) : null,
$canCreate ? item(set($createItem)) : null
);
jsVar('confirmDelete', $lang->gitlab->confirmDelete);
@@ -36,5 +36,5 @@ dtable
set::orderBy($orderBy),
set::sortLink(createLink('gitlab', 'browse', "orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")),
set::onRenderCell(jsRaw('window.renderCell')),
set::footPager(usePager()),
set::footPager(usePager())
);
+3 -3
View File
@@ -15,7 +15,7 @@ featureBar
backBtn
(
set::text($lang->goback),
set::url(createLink('gitlab', 'browseProject', "gitlabID={$gitlabID}")),
set::url(createLink('gitlab', 'browseProject', "gitlabID={$gitlabID}"))
)
);
hasPriv('instance', 'manage') ? toolBar
@@ -25,8 +25,8 @@ hasPriv('instance', 'manage') ? toolBar
setClass('btn primary'),
set::text($lang->gitlab->createBranch),
set::icon('plus'),
set::url(createLink('gitlab', 'createBranch', "gitlabID={$gitlabID}&projectID={$projectID}")),
),
set::url(createLink('gitlab', 'createBranch', "gitlabID={$gitlabID}&projectID={$projectID}"))
)
) : null;
$branchList = initTableData($gitlabBranchList, $config->gitlab->dtable->branch->fieldList, $this->gitlab);
+5 -5
View File
@@ -30,7 +30,7 @@ foreach($config->gitlab->menus as $key => $method)
(
setClass('' . ($key == 'group' ? 'active' : '')),
set::href(createLink('gitlab', $method, "gitlabID={$gitlabID}")),
$lang->gitlab->$langKey,
$lang->gitlab->$langKey
)
);
}
@@ -57,7 +57,7 @@ featureBar
set::id('groupDropmenu'),
set::objectID($gitlabID),
set::text($gitlab->name),
set::data(array('data' => array('group' => $menus), 'tabs' => array(array('name' => 'group', 'text' => '')))),
set::data(array('data' => array('group' => $menus), 'tabs' => array(array('name' => 'group', 'text' => ''))))
),
$items,
form
@@ -89,8 +89,8 @@ toolBar
'text' => $lang->gitlab->group->create,
'icon' => 'plus',
'class' => 'btn primary',
'url' => createLink('gitlab', 'createGroup', "gitlabID={$gitlabID}"),
))) : null,
'url' => createLink('gitlab', 'createGroup', "gitlabID={$gitlabID}")
))) : null
);
dtable
@@ -99,7 +99,7 @@ dtable
set::data($gitlabGroupList),
set::sortLink(createLink('gitlab', 'browseGroup', "gitlabID={$gitlabID}&orderBy={name}_{sortType}")),
set::onRenderCell(jsRaw('window.renderCell')),
set::orderBy($orderBy),
set::orderBy($orderBy)
);
render();
+4 -4
View File
@@ -31,7 +31,7 @@ foreach($config->gitlab->menus as $key => $method)
(
setClass('' . ($key == 'project' ? 'active' : '')),
set::href(createLink('gitlab', $method, "gitlabID={$gitlabID}")),
$lang->gitlab->$langKey,
$lang->gitlab->$langKey
)
);
}
@@ -58,7 +58,7 @@ featureBar
set::id('projectDropmenu'),
set::objectID($gitlabID),
set::text($gitlab->name),
set::data(array('data' => array('project' => $menus), 'tabs' => array(array('name' => 'project', 'text' => '')))),
set::data(array('data' => array('project' => $menus), 'tabs' => array(array('name' => 'project', 'text' => ''))))
),
$items,
form
@@ -90,8 +90,8 @@ toolBar
'text' => $lang->gitlab->project->create,
'icon' => 'plus',
'class' => 'btn primary',
'url' => createLink('gitlab', 'createProject', "gitlabID={$gitlabID}"),
))) : null,
'url' => createLink('gitlab', 'createProject', "gitlabID={$gitlabID}")
))) : null
);
dtable
+3 -3
View File
@@ -16,7 +16,7 @@ featureBar
backBtn
(
set::text($lang->goback),
set::url(createLink('gitlab', 'browseProject', "gitlabID={$gitlabID}")),
set::url(createLink('gitlab', 'browseProject', "gitlabID={$gitlabID}"))
),
form
(
@@ -47,8 +47,8 @@ hasPriv('instance', 'manage') ? toolBar
setClass('btn primary'),
set::text($lang->gitlab->createTag),
set::icon('plus'),
set::url(createLink('gitlab', 'createTag', "gitlabID={$gitlabID}&projectID={$projectID}")),
),
set::url(createLink('gitlab', 'createTag', "gitlabID={$gitlabID}&projectID={$projectID}"))
)
) : null;
$tagList = initTableData($gitlabTagList, $config->gitlab->dtable->tag->fieldList, $this->gitlab);
+5 -5
View File
@@ -28,7 +28,7 @@ foreach($config->gitlab->menus as $key => $method)
(
setClass('' . ($key == 'user' ? 'active' : '')),
set::href(createLink('gitlab', $method, "gitlabID={$gitlabID}")),
$lang->gitlab->$langKey,
$lang->gitlab->$langKey
)
);
}
@@ -52,7 +52,7 @@ featureBar
set::id('userDropmenu'),
set::objectID($gitlabID),
set::text($gitlabs[$gitlabID]),
set::data(array('data' => array('user' => $menus), 'tabs' => array(array('name' => 'user', 'text' => '')))),
set::data(array('data' => array('user' => $menus), 'tabs' => array(array('name' => 'user', 'text' => ''))))
),
$items,
form
@@ -84,8 +84,8 @@ toolBar
'text' => $lang->gitlab->user->create,
'icon' => 'plus',
'class' => 'btn primary',
'url' => createLink('gitlab', 'createUser', "gitlabID={$gitlabID}"),
))) : null,
'url' => createLink('gitlab', 'createUser', "gitlabID={$gitlabID}")
))) : null
);
dtable
@@ -93,5 +93,5 @@ dtable
set::cols($config->gitlab->dtable->user->fieldList),
set::data($gitlabUserList),
set::sortLink(createLink('gitlab', 'browseUser', "gitlabID={$gitlabID}&orderBy={name}_{sortType}")),
set::orderBy($orderBy),
set::orderBy($orderBy)
);
+1 -1
View File
@@ -45,5 +45,5 @@ formPanel
set::value($gitlab->token),
set::placeholder($lang->gitlab->placeholder->token)
)
),
)
);
+1 -1
View File
@@ -35,5 +35,5 @@ formPanel
set::items($branchPairs),
set::required(true)
)
),
)
);
+1 -1
View File
@@ -78,7 +78,7 @@ formPanel
set::items($lang->gitlab->group->projectCreationLevelList),
set::value('developer'),
set::required(true)
),
)
),
formGroup
(
+2 -2
View File
@@ -53,7 +53,7 @@ formPanel
inputGroup
(
$urlOptions
),
)
),
formGroup
(
@@ -61,7 +61,7 @@ formPanel
set::name('path'),
set::placeholder($lang->gitlab->placeholder->projectPath),
set::required(true),
set::width('2/3'),
set::width('2/3')
),
formGroup
(
+1 -1
View File
@@ -42,5 +42,5 @@ formPanel
set::name('message'),
set::label($lang->gitlab->tag->message),
set::width('1/2')
),
)
);
+8 -8
View File
@@ -22,14 +22,14 @@ formPanel
set::required(true),
set::items($userPairs),
set::width('1/2'),
on::change('onAccountChange'),
on::change('onAccountChange')
),
formGroup
(
set::name('name'),
set::label($lang->gitlab->user->name),
set::required(true),
set::width('1/2'),
set::width('1/2')
),
formGroup
(
@@ -51,7 +51,7 @@ formPanel
set::label($lang->gitlab->user->password),
set::required(true),
set::width('1/2'),
set::type('password'),
set::type('password')
),
formGroup
(
@@ -59,7 +59,7 @@ formPanel
set::label($lang->gitlab->user->passwordRepeat),
set::required(true),
set::width('1/2'),
set::type('password'),
set::type('password')
),
formRow
(
@@ -71,21 +71,21 @@ formPanel
set::placeholder($lang->gitlab->user->projectsLimit),
set::value('100000'),
set::width('1/2')
),
)
),
formGroup
(
set::name('can_create_group'),
set::label($lang->gitlab->user->canCreateGroup),
set::control(array('type' => 'checkbox', 'checked' => true)),
set::value('1'),
set::value('1')
),
formGroup
(
set::name('external'),
set::label($lang->gitlab->user->external),
set::control(array('type' => 'checkbox', 'text' => $lang->gitlab->user->externalTip)),
set::value('1'),
set::value('1')
),
formGroup
(
@@ -106,7 +106,7 @@ formPanel
icon
(
setClass('icon icon-pencil icon-2x'),
set::name(''),
set::name('')
)
)
)
+1 -1
View File
@@ -47,5 +47,5 @@ formPanel
set::value($gitlab->token),
set::placeholder($lang->gitlab->placeholder->token)
)
),
)
);
+1 -1
View File
@@ -33,7 +33,7 @@ formPanel
set::placeholder($lang->gitlab->project->name),
set::required(true),
set::value($project->name),
set::width('2/3'),
set::width('2/3')
),
formGroup
(
+7 -7
View File
@@ -26,7 +26,7 @@ formPanel
set::required(true),
set::items($userPairs),
set::value($zentaoBindAccount),
set::width('1/2'),
set::width('1/2')
),
formGroup
(
@@ -58,7 +58,7 @@ formPanel
set::label($lang->gitlab->user->password),
set::required(true),
set::width('1/2'),
set::type('password'),
set::type('password')
),
formGroup
(
@@ -66,7 +66,7 @@ formPanel
set::label($lang->gitlab->user->passwordRepeat),
set::required(true),
set::width('1/2'),
set::type('password'),
set::type('password')
),
formRow
(
@@ -78,21 +78,21 @@ formPanel
set::placeholder($lang->gitlab->user->projectsLimit),
set::value($user->projects_limit),
set::width('1/2')
),
)
),
formGroup
(
set::name('can_create_group'),
set::label($lang->gitlab->user->canCreateGroup),
set::control(array('type' => 'checkbox', 'checked' => $user->can_create_group ? true : false)),
set::value('1'),
set::value('1')
),
formGroup
(
set::name('external'),
set::label($lang->gitlab->user->external),
set::control(array('type' => 'checkbox', 'text' => $lang->gitlab->user->externalTip, 'checked' => $user->external ? true : false)),
set::value('1'),
set::value('1')
),
formGroup
(
@@ -113,7 +113,7 @@ formPanel
icon
(
setClass('icon icon-pencil icon-2x'),
set::name(''),
set::name('')
)
)
)
+2 -2
View File
@@ -20,7 +20,7 @@ formBatchPanel
set::name('id'),
set::label('ID'),
set::control('index'),
set::width('50px'),
set::width('50px')
),
formBatchItem
(
@@ -34,7 +34,7 @@ formBatchPanel
'name' => 'name',
'cache' => false,
'items' => $branchPairs,
'menu' => jsRaw('{getItem(item) {return getMenu(item)}}'),
'menu' => jsRaw('{getItem(item) {return getMenu(item)}}')
)
)
),
+3 -3
View File
@@ -20,7 +20,7 @@ formBatchPanel
set::name('index'),
set::label('ID'),
set::control('index'),
set::width('50px'),
set::width('50px')
),
formBatchItem
(
@@ -34,7 +34,7 @@ formBatchPanel
'name' => 'id',
'cache' => false,
'items' => $gitlabUsers,
'menu' => jsRaw('{getItem(item) {return getMenu(item)}}'),
'menu' => jsRaw('{getItem(item) {return getMenu(item)}}')
)
)
),
@@ -51,6 +51,6 @@ formBatchPanel
set::name('expires_at'),
set::label($lang->gitlab->group->memberExpiresAt),
set::control('datePicker'),
set::width('1/3'),
set::width('1/3')
)
);
@@ -20,7 +20,7 @@ formBatchPanel
set::name('id'),
set::label('ID'),
set::control('index'),
set::width('50px'),
set::width('50px')
),
formBatchItem
(
@@ -34,7 +34,7 @@ formBatchPanel
'name' => 'account',
'cache' => false,
'items' => $users,
'menu' => jsRaw('{getItem(item) {return getMenu(item)}}'),
'menu' => jsRaw('{getItem(item) {return getMenu(item)}}')
)
)
),
@@ -51,6 +51,6 @@ formBatchPanel
set::name('expires_at'),
set::label($lang->gitlab->group->memberExpiresAt),
set::control('datePicker'),
set::width('1/3'),
set::width('1/3')
)
);
+2 -2
View File
@@ -20,7 +20,7 @@ formBatchPanel
set::name('id'),
set::label('ID'),
set::control('index'),
set::width('50px'),
set::width('50px')
),
formBatchItem
(
@@ -34,7 +34,7 @@ formBatchPanel
'name' => 'name',
'cache' => false,
'items' => $tagPairs,
'menu' => jsRaw('{getItem(item) {return getMenu(item)}}'),
'menu' => jsRaw('{getItem(item) {return getMenu(item)}}')
)
)
),
+3 -3
View File
@@ -18,7 +18,7 @@ detailHeader
entityLabel(
set(array('entityID' => $gitlab->id, 'level' => 1, 'text' => $gitlab->name))
)
),
)
);
detailBody
@@ -30,9 +30,9 @@ detailBody
set::title($lang->gitlab->url),
set::content("<a href='{$gitlab->url}' target='_blank'>{$gitlab->url}</a>"),
set::useHtml(true)
),
)
),
history(),
history()
);
render();