From 44de2ad2ab027f32abe4194c8a0502a2623eee85 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Tue, 14 Nov 2023 10:53:27 +0800
Subject: [PATCH] * Remove `,` at the end of row in the lastest children in
 gitlab.

---
 module/gitlab/ui/binduser.html.php             |  6 +++---
 module/gitlab/ui/browse.html.php               |  4 ++--
 module/gitlab/ui/browsebranch.html.php         |  6 +++---
 module/gitlab/ui/browsegroup.html.php          | 10 +++++-----
 module/gitlab/ui/browseproject.html.php        |  8 ++++----
 module/gitlab/ui/browsetag.html.php            |  6 +++---
 module/gitlab/ui/browseuser.html.php           | 10 +++++-----
 module/gitlab/ui/create.html.php               |  2 +-
 module/gitlab/ui/createbranch.html.php         |  2 +-
 module/gitlab/ui/creategroup.html.php          |  2 +-
 module/gitlab/ui/createproject.html.php        |  4 ++--
 module/gitlab/ui/createtag.html.php            |  2 +-
 module/gitlab/ui/createuser.html.php           | 16 ++++++++--------
 module/gitlab/ui/edit.html.php                 |  2 +-
 module/gitlab/ui/editproject.html.php          |  2 +-
 module/gitlab/ui/edituser.html.php             | 14 +++++++-------
 module/gitlab/ui/managebranchpriv.html.php     |  4 ++--
 module/gitlab/ui/managegroupmembers.html.php   |  6 +++---
 module/gitlab/ui/manageprojectmembers.html.php |  6 +++---
 module/gitlab/ui/managetagpriv.html.php        |  4 ++--
 module/gitlab/ui/view.html.php                 |  6 +++---
 21 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/module/gitlab/ui/binduser.html.php b/module/gitlab/ui/binduser.html.php
index 704e6bcc68..fa04e57daa 100644
--- a/module/gitlab/ui/binduser.html.php
+++ b/module/gitlab/ui/binduser.html.php
@@ -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()}')
                 )
             )
-        )),
+        ))
     )
 );
diff --git a/module/gitlab/ui/browse.html.php b/module/gitlab/ui/browse.html.php
index 8ed12c785d..945fcc4a51 100644
--- a/module/gitlab/ui/browse.html.php
+++ b/module/gitlab/ui/browse.html.php
@@ -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())
 );
diff --git a/module/gitlab/ui/browsebranch.html.php b/module/gitlab/ui/browsebranch.html.php
index 55a9cd95cf..c8340e4ecb 100644
--- a/module/gitlab/ui/browsebranch.html.php
+++ b/module/gitlab/ui/browsebranch.html.php
@@ -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);
diff --git a/module/gitlab/ui/browsegroup.html.php b/module/gitlab/ui/browsegroup.html.php
index fafee5f076..170620cbeb 100644
--- a/module/gitlab/ui/browsegroup.html.php
+++ b/module/gitlab/ui/browsegroup.html.php
@@ -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();
diff --git a/module/gitlab/ui/browseproject.html.php b/module/gitlab/ui/browseproject.html.php
index 3c66ccd942..215c63c46c 100644
--- a/module/gitlab/ui/browseproject.html.php
+++ b/module/gitlab/ui/browseproject.html.php
@@ -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
diff --git a/module/gitlab/ui/browsetag.html.php b/module/gitlab/ui/browsetag.html.php
index 20557f5ec1..4cd6761c82 100644
--- a/module/gitlab/ui/browsetag.html.php
+++ b/module/gitlab/ui/browsetag.html.php
@@ -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);
diff --git a/module/gitlab/ui/browseuser.html.php b/module/gitlab/ui/browseuser.html.php
index be42f3bdc4..5077c8b032 100644
--- a/module/gitlab/ui/browseuser.html.php
+++ b/module/gitlab/ui/browseuser.html.php
@@ -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)
 );
diff --git a/module/gitlab/ui/create.html.php b/module/gitlab/ui/create.html.php
index 12fdbe68ce..eb2335e5e4 100644
--- a/module/gitlab/ui/create.html.php
+++ b/module/gitlab/ui/create.html.php
@@ -45,5 +45,5 @@ formPanel
             set::value($gitlab->token),
             set::placeholder($lang->gitlab->placeholder->token)
         )
-    ),
+    )
 );
diff --git a/module/gitlab/ui/createbranch.html.php b/module/gitlab/ui/createbranch.html.php
index 87e69831a6..0953d90651 100644
--- a/module/gitlab/ui/createbranch.html.php
+++ b/module/gitlab/ui/createbranch.html.php
@@ -35,5 +35,5 @@ formPanel
             set::items($branchPairs),
             set::required(true)
         )
-    ),
+    )
 );
diff --git a/module/gitlab/ui/creategroup.html.php b/module/gitlab/ui/creategroup.html.php
index d1cf2488ca..ec49239b12 100644
--- a/module/gitlab/ui/creategroup.html.php
+++ b/module/gitlab/ui/creategroup.html.php
@@ -78,7 +78,7 @@ formPanel
             set::items($lang->gitlab->group->projectCreationLevelList),
             set::value('developer'),
             set::required(true)
-        ),
+        )
     ),
     formGroup
     (
diff --git a/module/gitlab/ui/createproject.html.php b/module/gitlab/ui/createproject.html.php
index 03bd5fbb50..94eb904542 100644
--- a/module/gitlab/ui/createproject.html.php
+++ b/module/gitlab/ui/createproject.html.php
@@ -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
     (
diff --git a/module/gitlab/ui/createtag.html.php b/module/gitlab/ui/createtag.html.php
index 0ca28d784d..96baeafb77 100644
--- a/module/gitlab/ui/createtag.html.php
+++ b/module/gitlab/ui/createtag.html.php
@@ -42,5 +42,5 @@ formPanel
         set::name('message'),
         set::label($lang->gitlab->tag->message),
         set::width('1/2')
-    ),
+    )
 );
diff --git a/module/gitlab/ui/createuser.html.php b/module/gitlab/ui/createuser.html.php
index 1f4b143216..4462cab1bf 100644
--- a/module/gitlab/ui/createuser.html.php
+++ b/module/gitlab/ui/createuser.html.php
@@ -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('')
                 )
             )
         )
diff --git a/module/gitlab/ui/edit.html.php b/module/gitlab/ui/edit.html.php
index 01222a2fe9..7ee7ae7b17 100644
--- a/module/gitlab/ui/edit.html.php
+++ b/module/gitlab/ui/edit.html.php
@@ -47,5 +47,5 @@ formPanel
             set::value($gitlab->token),
             set::placeholder($lang->gitlab->placeholder->token)
         )
-    ),
+    )
 );
diff --git a/module/gitlab/ui/editproject.html.php b/module/gitlab/ui/editproject.html.php
index de33d6ec38..54e5c11b00 100644
--- a/module/gitlab/ui/editproject.html.php
+++ b/module/gitlab/ui/editproject.html.php
@@ -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
     (
diff --git a/module/gitlab/ui/edituser.html.php b/module/gitlab/ui/edituser.html.php
index 04f58b57a1..6fceba7a0d 100644
--- a/module/gitlab/ui/edituser.html.php
+++ b/module/gitlab/ui/edituser.html.php
@@ -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('')
                 )
             )
         )
diff --git a/module/gitlab/ui/managebranchpriv.html.php b/module/gitlab/ui/managebranchpriv.html.php
index ada88bce94..54e4792593 100644
--- a/module/gitlab/ui/managebranchpriv.html.php
+++ b/module/gitlab/ui/managebranchpriv.html.php
@@ -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)}}')
             )
         )
     ),
diff --git a/module/gitlab/ui/managegroupmembers.html.php b/module/gitlab/ui/managegroupmembers.html.php
index 54f3b15a7e..9ae06a04d7 100644
--- a/module/gitlab/ui/managegroupmembers.html.php
+++ b/module/gitlab/ui/managegroupmembers.html.php
@@ -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')
     )
 );
diff --git a/module/gitlab/ui/manageprojectmembers.html.php b/module/gitlab/ui/manageprojectmembers.html.php
index 774d6e003f..ed456a0baa 100644
--- a/module/gitlab/ui/manageprojectmembers.html.php
+++ b/module/gitlab/ui/manageprojectmembers.html.php
@@ -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')
     )
 );
diff --git a/module/gitlab/ui/managetagpriv.html.php b/module/gitlab/ui/managetagpriv.html.php
index 91de38fb92..a31b180935 100644
--- a/module/gitlab/ui/managetagpriv.html.php
+++ b/module/gitlab/ui/managetagpriv.html.php
@@ -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)}}')
             )
         )
     ),
diff --git a/module/gitlab/ui/view.html.php b/module/gitlab/ui/view.html.php
index f5829a6664..b952961825 100644
--- a/module/gitlab/ui/view.html.php
+++ b/module/gitlab/ui/view.html.php
@@ -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();