From 338f098eca1b7f272a0b1340471fdfe63ffff477 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Mon, 13 Nov 2023 10:02:53 +0800
Subject: [PATCH] * Remove `,` at the end of row in the lastest children in
 bug.

---
 module/bug/ui/activate.html.php      |  2 +-
 module/bug/ui/assignto.html.php      |  8 +++----
 module/bug/ui/batchactivate.html.php |  2 +-
 module/bug/ui/batchcreate.html.php   | 36 ++++++++++++++--------------
 module/bug/ui/batchedit.html.php     | 30 +++++++++++------------
 module/bug/ui/browse.html.php        | 10 ++++----
 module/bug/ui/confirm.html.php       | 10 ++++----
 module/bug/ui/create.html.php        | 14 +++++------
 module/bug/ui/edit.html.php          |  6 ++---
 module/bug/ui/linkbugs.html.php      |  2 +-
 module/bug/ui/report.html.php        |  2 +-
 module/bug/ui/resolve.html.php       | 30 +++++++++++------------
 module/bug/ui/view.html.php          | 14 +++++------
 13 files changed, 83 insertions(+), 83 deletions(-)

diff --git a/module/bug/ui/activate.html.php b/module/bug/ui/activate.html.php
index 88ce2c5bdd..a9b3ff3270 100644
--- a/module/bug/ui/activate.html.php
+++ b/module/bug/ui/activate.html.php
@@ -22,7 +22,7 @@ formPanel
         (
             set::name('assignedTo'),
             set::value($bug->resolvedBy),
-            set::items($users),
+            set::items($users)
         )
     ),
     formGroup
diff --git a/module/bug/ui/assignto.html.php b/module/bug/ui/assignto.html.php
index 8b972acbc8..e536f55f21 100644
--- a/module/bug/ui/assignto.html.php
+++ b/module/bug/ui/assignto.html.php
@@ -27,7 +27,7 @@ formPanel
         set::name('assignedTo'),
         set::label($lang->bug->assignedTo),
         set::value($bug->assignedTo),
-        set::items($users),
+        set::items($users)
     ),
     formGroup
     (
@@ -36,15 +36,15 @@ formPanel
         set::name('mailto[]'),
         set::value(str_replace(' ', '', $bug->mailto ?: '')),
         set::items($users),
-        set::multiple(true),
+        set::multiple(true)
     ),
     formGroup
     (
         set::label($lang->comment),
         set::name('comment'),
         set::control('editor'),
-        set::rows(6),
-    ),
+        set::rows(6)
+    )
 );
 hr();
 history();
diff --git a/module/bug/ui/batchactivate.html.php b/module/bug/ui/batchactivate.html.php
index 7063a6987a..c7007a4f33 100644
--- a/module/bug/ui/batchactivate.html.php
+++ b/module/bug/ui/batchactivate.html.php
@@ -30,7 +30,7 @@ formBatchPanel
     set::title($lang->bug->common . $lang->colon . $lang->bug->batchActivate),
     set::mode('edit'),
     set::items($items),
-    set::data(array_values($bugs)),
+    set::data(array_values($bugs))
 );
 
 render();
diff --git a/module/bug/ui/batchcreate.html.php b/module/bug/ui/batchcreate.html.php
index 5db646e543..2e0beaaee8 100644
--- a/module/bug/ui/batchcreate.html.php
+++ b/module/bug/ui/batchcreate.html.php
@@ -34,7 +34,7 @@ $items[] = array
     'name'    => 'id',
     'label'   => $lang->idAB,
     'control' => 'index',
-    'width'   => '32px',
+    'width'   => '32px'
 );
 
 /* Field of branch. */
@@ -47,7 +47,7 @@ $items[] = array
     'items'   => $branches,
     'value'   => $branch,
     'width'   => '200px',
-    'ditto'   => true,
+    'ditto'   => true
 );
 
 /* Field of module. */
@@ -60,7 +60,7 @@ $items[] = array
     'value'    => $moduleID,
     'width'    => '200px',
     'required' => isset($requiredFields['module']),
-    'ditto'    => true,
+    'ditto'    => true
 );
 
 /* Field of project. */
@@ -74,7 +74,7 @@ $items[] = array
     'value'    => $projectID,
     'width'    => '200px',
     'required' => isset($requiredFields['project']),
-    'ditto'    => true,
+    'ditto'    => true
 );
 
 /* Field of execution. */
@@ -88,7 +88,7 @@ $items[] = array
     'value'    => $executionID,
     'width'    => '200px',
     'required' => isset($requiredFields['execution']),
-    'ditto'    => true,
+    'ditto'    => true
 );
 
 /* Field of openedBuild. */
@@ -102,7 +102,7 @@ $items[] = array
     'multiple' => true,
     'width'    => '200px',
     'required' => true,
-    'ditto'    => true,
+    'ditto'    => true
 );
 
 /* Field of title. */
@@ -111,7 +111,7 @@ $items[] = array
     'name'     => 'title',
     'label'    => $lang->bug->title,
     'width'    => '240px',
-    'required' => true,
+    'required' => true
 );
 
 /* Field of region and lane. */
@@ -125,7 +125,7 @@ if(isset($executionType) && $executionType == 'kanban')
         'value'    => $regionID,
         'items'    => $regionPairs,
         'width'    => '200px',
-        'required' => true,
+        'required' => true
     );
 
     $items[] = array
@@ -136,7 +136,7 @@ if(isset($executionType) && $executionType == 'kanban')
         'value'    => $laneID,
         'items'    => $lanePairs,
         'width'    => '200px',
-        'required' => true,
+        'required' => true
     );
 }
 
@@ -149,7 +149,7 @@ $items[] = array
     'control'  => 'date',
     'width'    => '136px',
     'required' => isset($requiredFields['deadline']),
-    'ditto'    => true,
+    'ditto'    => true
 );
 
 /* Field of steps. */
@@ -159,7 +159,7 @@ $items[] = array
     'label'    => $lang->bug->steps,
     'hidden'   => zget($visibleFields, 'steps', true, false),
     'width'    => '240px',
-    'required' => isset($requiredFields['steps']),
+    'required' => isset($requiredFields['steps'])
 );
 
 /* Field of type. */
@@ -173,7 +173,7 @@ $items[] = array
     'value'    => '',
     'width'    => '160px',
     'required' => isset($requiredFields['type']),
-    'ditto'    => true,
+    'ditto'    => true
 );
 
 /* Field of pri. */
@@ -187,7 +187,7 @@ $items[] = array
     'value'    => 3,
     'width'    => '100px',
     'required' => isset($requiredFields['pri']),
-    'ditto'    => true,
+    'ditto'    => true
 );
 
 /* Field of severity. */
@@ -200,7 +200,7 @@ $items[] = array
     'items'    => $lang->bug->severityList,
     'value'    => 3,
     'width'    => '80px',
-    'required' => isset($requiredFields['severity']),
+    'required' => isset($requiredFields['severity'])
 );
 
 /* Field of os. */
@@ -213,7 +213,7 @@ $items[] = array
     'items'    => $lang->bug->osList,
     'width'    => '200px',
     'multiple' => true,
-    'required' => isset($requiredFields['os']),
+    'required' => isset($requiredFields['os'])
 );
 
 /* Field of browser. */
@@ -226,7 +226,7 @@ $items[] = array
     'items'    => $lang->bug->browserList,
     'width'    => '200px',
     'multiple' => true,
-    'required' => isset($requiredFields['browser']),
+    'required' => isset($requiredFields['browser'])
 );
 
 /* Field of keywords. */
@@ -236,7 +236,7 @@ $items[] = array
     'label'    => $lang->bug->keywords,
     'hidden'   => zget($visibleFields, 'keywords', true, false),
     'width'    => '200px',
-    'required' => isset($requiredFields['keywords']),
+    'required' => isset($requiredFields['keywords'])
 );
 
 formBatchPanel
@@ -249,7 +249,7 @@ formBatchPanel
     on::change('[data-name="project"]', 'loadProductExecutionsByProject'),
     on::change('[data-name="execution"]', 'loadExecutionBuilds'),
     on::change('[data-name="region"]', 'setLane'),
-    formHidden('product', $product->id),
+    formHidden('product', $product->id)
 );
 
 render();
diff --git a/module/bug/ui/batchedit.html.php b/module/bug/ui/batchedit.html.php
index dc203d8a60..2813b4f62e 100644
--- a/module/bug/ui/batchedit.html.php
+++ b/module/bug/ui/batchedit.html.php
@@ -47,7 +47,7 @@ formBatchPanel
         set::name('id'),
         set::label($lang->idAB),
         set::control('hidden'),
-        set::hidden(true),
+        set::hidden(true)
     ),
     /* Field of id index. */
     formBatchItem
@@ -55,7 +55,7 @@ formBatchPanel
         set::name('id'),
         set::label($lang->idAB),
         set::control('index'),
-        set::width('32px'),
+        set::width('32px')
     ),
     /* Field of type. */
     formBatchItem
@@ -79,7 +79,7 @@ formBatchPanel
         set::control('severityPicker'),
         set::items($lang->bug->severityList),
         set::width('80px'),
-        set::required(isset($requiredFields['severity'])),
+        set::required(isset($requiredFields['severity']))
     ),
     /* Field of pri. */
     formBatchItem
@@ -90,7 +90,7 @@ formBatchPanel
         set::control('priPicker'),
         set::items($lang->bug->priList),
         set::width('80px'),
-        set::required(isset($requiredFields['pri'])),
+        set::required(isset($requiredFields['pri']))
     ),
     /* Field of title. */
     formBatchItem
@@ -98,7 +98,7 @@ formBatchPanel
         set::name('title'),
         set::label($lang->bug->title),
         set::width('240px'),
-        set::required(true),
+        set::required(true)
     ),
     /* Field of branch. */
     formBatchItem
@@ -109,7 +109,7 @@ formBatchPanel
         set::items(array()),
         set::width('200px'),
         set::required(isset($requiredFields['branch'])),
-        set::hidden(!$branchProduct),
+        set::hidden(!$branchProduct)
     ),
     /* Field of module. */
     formBatchItem
@@ -155,7 +155,7 @@ formBatchPanel
         set::hidden(zget($visibleFields, 'deadline', true, false)),
         set::control('date'),
         set::width('128px'),
-        set::required(isset($requiredFields['deadline'])),
+        set::required(isset($requiredFields['deadline']))
     ),
     /* Field of os. */
     formBatchItem
@@ -167,7 +167,7 @@ formBatchPanel
         set::items($lang->bug->osList),
         set::multiple(true),
         set::width('200px'),
-        set::required(isset($requiredFields['os'])),
+        set::required(isset($requiredFields['os']))
     ),
     /* Field of browser. */
     formBatchItem
@@ -179,7 +179,7 @@ formBatchPanel
         set::items($lang->bug->browserList),
         set::multiple(true),
         set::width('200px'),
-        set::required(isset($requiredFields['browser'])),
+        set::required(isset($requiredFields['browser']))
     ),
     /* Field of keywords. */
     formBatchItem
@@ -188,7 +188,7 @@ formBatchPanel
         set::label($lang->bug->keywords),
         set::hidden(zget($visibleFields, 'keywords', true, false)),
         set::width('200px'),
-        set::required(isset($requiredFields['keywords'])),
+        set::required(isset($requiredFields['keywords']))
     ),
     /* Field of resolvedBy. */
     formBatchItem
@@ -215,7 +215,7 @@ formBatchPanel
             (
                 set::name('resolution'),
                 set::items($lang->bug->resolutionList),
-                set::required(isset($requiredFields['resolution'])),
+                set::required(isset($requiredFields['resolution']))
             ),
             picker
             (
@@ -223,10 +223,10 @@ formBatchPanel
                 set::name('duplicateBug'),
                 set::items(array()),
                 set::placeholder($lang->bug->placeholder->duplicate),
-                set::required(true),
-            ),
-        ),
-    ),
+                set::required(true)
+            )
+        )
+    )
 );
 
 render();
diff --git a/module/bug/ui/browse.html.php b/module/bug/ui/browse.html.php
index d32374bc0f..17e767af3e 100644
--- a/module/bug/ui/browse.html.php
+++ b/module/bug/ui/browse.html.php
@@ -81,11 +81,11 @@ if(!isonlybody())
             (
                 btn(setClass('btn primary dropdown-toggle'), setStyle(array('padding' => '6px', 'border-radius' => '0 2px 2px 0'))),
                 set::items(array($createItem, $batchCreateItem)),
-                set::placement('bottom-end'),
+                set::placement('bottom-end')
             )
         ) : null,
         $canCreate && !$canBatchCreate ? item(set($createItem + array('class' => 'btn primary', 'icon' => 'plus'))) : null,
-        $canBatchCreate && !$canCreate ? item(set($batchCreateItem + array('class' => 'btn primary', 'icon' => 'plus'))) : null,
+        $canBatchCreate && !$canCreate ? item(set($batchCreateItem + array('class' => 'btn primary', 'icon' => 'plus'))) : null
     );
 }
 
@@ -98,7 +98,7 @@ sidebar
         'modules'     => $moduleTree,
         'activeKey'   => $currentModuleID,
         'closeLink'   => $closeLink,
-        'settingLink' => $settingLink,
+        'settingLink' => $settingLink
     )))
 );
 
@@ -152,7 +152,7 @@ if($canBatchAction)
     $footToolbar['items'][] = array('type' => 'btn-group', 'items' => array
     (
         array('text' => $lang->edit, 'className' => 'primary batch-btn not-open-url', 'disabled' => ($canBatchEdit ? '': 'disabled'), 'data-url' => createLink('bug', 'batchEdit', "productID={$product->id}&branch=$branch")),
-        array('caret' => 'up', 'data-placement' => 'top-start', 'class' => 'btn btn-caret size-sm primary not-open-url', 'items' => $batchItems),
+        array('caret' => 'up', 'data-placement' => 'top-start', 'class' => 'btn btn-caret size-sm primary not-open-url', 'items' => $batchItems)
     ));
     if($canBatchChangeBranch && $product->type != 'normal')
     {
@@ -197,7 +197,7 @@ dtable
     set::modules($modulePairs),
     set::emptyTip($lang->bug->notice->noBug),
     set::createTip($lang->bug->create),
-    set::createLink($canBeChanged && hasPriv('bug', 'create') ? createLink('bug', 'create', "productID={$product->id}&branch={$branch}&extra=moduleID=$currentModuleID") : ''),
+    set::createLink($canBeChanged && hasPriv('bug', 'create') ? createLink('bug', 'create', "productID={$product->id}&branch={$branch}&extra=moduleID=$currentModuleID") : '')
 );
 
 render();
diff --git a/module/bug/ui/confirm.html.php b/module/bug/ui/confirm.html.php
index 0ac656be0c..43e7bc09cf 100644
--- a/module/bug/ui/confirm.html.php
+++ b/module/bug/ui/confirm.html.php
@@ -24,8 +24,8 @@ formPanel
         (
             set::name('assignedTo'),
             set::items($users),
-            set::value($bug->assignedTo),
-        ),
+            set::value($bug->assignedTo)
+        )
     ),
     formGroup
     (
@@ -54,7 +54,7 @@ formPanel
             set::name('status'),
             set::control('hidden'),
             set::value($bug->status)
-        ),
+        )
     ),
     formGroup
     (
@@ -64,7 +64,7 @@ formPanel
             set::items($users),
             set::multiple(true),
             set::name('mailto[]'),
-            set::value(str_replace(' ', '', $bug->mailto ? $bug->mailto : '')),
+            set::value(str_replace(' ', '', $bug->mailto ? $bug->mailto : ''))
         )
     ),
     formGroup
@@ -73,7 +73,7 @@ formPanel
         editor
         (
             set::name('comment'),
-            set::value(),
+            set::value()
         )
     )
 );
diff --git a/module/bug/ui/create.html.php b/module/bug/ui/create.html.php
index db6a39a519..d431431d33 100644
--- a/module/bug/ui/create.html.php
+++ b/module/bug/ui/create.html.php
@@ -230,7 +230,7 @@ formPanel
             set::label($lang->bug->feedbackBy),
             set::name('feedbackBy'),
             set::value(isset($bug->feedbackBy) ? $bug->feedbackBy : '')
-        ),
+        )
     ),
     formRow
     (
@@ -332,7 +332,7 @@ formPanel
                 set::name('steps'),
                 html($bug->steps)
             )
-        ),
+        )
     ),
     formRow
     (
@@ -434,26 +434,26 @@ formPanel
         (
             setClass('hidden'),
             set::name('case'),
-            set::value($bug->caseID),
+            set::value($bug->caseID)
         ),
         input
         (
             setClass('hidden'),
             set::name('caseVersion'),
-            set::value($bug->version),
+            set::value($bug->version)
         ),
         input
         (
             setClass('hidden'),
             set::name('result'),
-            set::value($bug->runID),
+            set::value($bug->runID)
         ),
         input
         (
             setClass('hidden'),
             set::name('testtask'),
-            set::value($bug->testtask),
-        ),
+            set::value($bug->testtask)
+        )
     )
 );
 
diff --git a/module/bug/ui/edit.html.php b/module/bug/ui/edit.html.php
index 870a484f98..f02de74451 100644
--- a/module/bug/ui/edit.html.php
+++ b/module/bug/ui/edit.html.php
@@ -498,7 +498,7 @@ detailBody
                     (
                         set::name('resolvedBuild'),
                         set::items($resolvedBuilds),
-                        set::value($bug->resolvedBuild),
+                        set::value($bug->resolvedBuild)
                     ),
                     span
                     (
@@ -551,7 +551,7 @@ detailBody
                     set::name('closedDate'),
                     set::value($bug->closedDate)
                 )
-            ),
+            )
         ),
         tableData
         (
@@ -567,7 +567,7 @@ detailBody
                     (
                         set::multiple(true),
                         set::name('relatedBug[]'),
-                        set::items(isset($bug->relatedBugTitles) ? $bug->relatedBugTitles : array()),
+                        set::items(isset($bug->relatedBugTitles) ? $bug->relatedBugTitles : array())
                     ),
                     common::hasPriv('bug', 'linkBugs') ? span
                     (
diff --git a/module/bug/ui/linkbugs.html.php b/module/bug/ui/linkbugs.html.php
index 7b7a8d90dc..984a53df6c 100644
--- a/module/bug/ui/linkbugs.html.php
+++ b/module/bug/ui/linkbugs.html.php
@@ -22,7 +22,7 @@ dtable
     set::data($bugs2Link),
     set::footPager(usePager()),
     set::footToolbar(array('items' => array(array('text' => $lang->save, 'btnType' => 'primary', 'className' => 'size-sm', 'data-on' => 'click', 'data-call' => 'fnLinkBugs', 'data-params' => 'event')))),
-    set::footer(array('checkbox', 'toolbar')),
+    set::footer(array('checkbox', 'toolbar'))
 );
 
 h::js
diff --git a/module/bug/ui/report.html.php b/module/bug/ui/report.html.php
index 7845e0b01a..22d4f5a818 100644
--- a/module/bug/ui/report.html.php
+++ b/module/bug/ui/report.html.php
@@ -20,7 +20,7 @@ detailHeader
             set::level(1),
             set::text($lang->bug->report->common)
         )
-    ),
+    )
 );
 
 $reports = array();
diff --git a/module/bug/ui/resolve.html.php b/module/bug/ui/resolve.html.php
index 044855495d..6a8817d6aa 100644
--- a/module/bug/ui/resolve.html.php
+++ b/module/bug/ui/resolve.html.php
@@ -27,7 +27,7 @@ if(common::hasPriv('build', 'create'))
             set::id('createBuild'),
             set::name('createBuild'),
             set::rootClass('ml-4 items-center'),
-            set::text($lang->bug->createBuild),
+            set::text($lang->bug->createBuild)
         )
     );
 }
@@ -44,7 +44,7 @@ formPanel
         set::label($lang->bug->resolution),
         set::value(''),
         set::items($lang->bug->resolutionList),
-        on::change('setDuplicate'),
+        on::change('setDuplicate')
     ),
     formRow
     (
@@ -58,8 +58,8 @@ formPanel
             set::items(array()),
             set::placeholder($lang->bug->placeholder->duplicate),
             set::value(''),
-            set::required(true),
-        ),
+            set::required(true)
+        )
     ),
     formRow
     (
@@ -74,8 +74,8 @@ formPanel
             (
                 set::name('buildExecution'),
                 set::items($executions),
-                set::value($bug->execution),
-            ),
+                set::value($bug->execution)
+            )
         ),
         formGroup
         (
@@ -84,7 +84,7 @@ formPanel
             set::label($lang->bug->resolvedBuild),
             set::name('resolvedBuild'),
             set::value(''),
-            set::items($builds),
+            set::items($builds)
         ),
         formGroup
         (
@@ -101,12 +101,12 @@ formPanel
                     input
                     (
                         set::name('buildName'),
-                        set::value(''),
-                    ),
-                ),
-            ),
+                        set::value('')
+                    )
+                )
+            )
         ),
-        $createBuild,
+        $createBuild
     ),
     formGroup
     (
@@ -122,7 +122,7 @@ formPanel
         set::name('assignedTo'),
         set::label($lang->bug->assignedTo),
         set::value($bug->assignedTo),
-        set::items($users),
+        set::items($users)
     ),
     formGroup
     (
@@ -134,8 +134,8 @@ formPanel
         set::label($lang->comment),
         set::name('comment'),
         set::control('editor'),
-        set::rows(6),
-    ),
+        set::rows(6)
+    )
 );
 hr();
 history();
diff --git a/module/bug/ui/view.html.php b/module/bug/ui/view.html.php
index 3d19540652..f7b26da107 100644
--- a/module/bug/ui/view.html.php
+++ b/module/bug/ui/view.html.php
@@ -117,8 +117,8 @@ $legendMain['story']['text']          = $bug->story ? div
             set::href(createLink('bug', 'confirmStoryChange', "bugID=$bug->id")),
             $lang->confirm,
         ),
-        ')',
-    ) : '',
+        ')'
+    ) : ''
 ) : '';
 $legendMain['task']['text']           = $bug->task  ? div(label(set('class', 'dark-outline rounded-full size-sm mr-2'), $bug->task),  span($bug->taskName))   : '';;
 $legendMisc['relatedBug']['text']     = $relatedBugs;
@@ -178,7 +178,7 @@ $buildItems = function($items): array
                 !empty($item['attr']) && is_array($item['attr']) ? set($item['attr']) : null,
                 $item['text']
             ) : $item['text'],
-            set::collapse(!empty($item['text'])),
+            set::collapse(!empty($item['text']))
         );
     }
 
@@ -199,8 +199,8 @@ detailBody
         fileList
         (
             set::files($bug->files),
-            set::padding(false),
-        ),
+            set::padding(false)
+        )
     ),
     history(),
     floatToolbar
@@ -287,7 +287,7 @@ modal
                 set::required(true),
                 set::control('picker'),
                 set::name('taskProjects'),
-                set::items($projects),
+                set::items($projects)
             )
         ),
         formRow
@@ -302,7 +302,7 @@ modal
                     picker
                     (
                         set::name('execution'),
-                        set::items($executions),
+                        set::items($executions)
                     )
                 )
             )