From d96afd13dcaf0fe1bf5879f8a66bf297912028e2 Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Tue, 21 Nov 2023 05:20:32 +0000
Subject: [PATCH]  * Add pager on feature bar.  * Format codes.

---
 module/project/control.php           |  2 +-
 module/project/ui/batchedit.html.php |  2 +-
 module/project/ui/bug.html.php       | 20 +++++++++++---------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/module/project/control.php b/module/project/control.php
index 5cfa4f6f53..47e369ba48 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -1309,7 +1309,7 @@ class project extends control
      */
     public function activate(int $projectID)
     {
-        $project   = $this->project->getByID($projectID);
+        $project = $this->project->getByID($projectID);
 
         if(!empty($_POST))
         {
diff --git a/module/project/ui/batchedit.html.php b/module/project/ui/batchedit.html.php
index 1ae5a280b6..640bcb6b90 100644
--- a/module/project/ui/batchedit.html.php
+++ b/module/project/ui/batchedit.html.php
@@ -13,7 +13,7 @@ namespace zin;
 $programAclList = array();
 $projectAclList = array();
 foreach($lang->program->subAcls as $acl => $label) $programAclList[] = array('text' => $label, 'value' => $acl);
-foreach($lang->project->acls as $acl => $label) $projectAclList[] = array('text' => $label, 'value' => $acl);
+foreach($lang->project->acls as $acl => $label)    $projectAclList[] = array('text' => $label, 'value' => $acl);
 
 jsVar('LONG_TIME', LONG_TIME);
 jsVar('weekend', $config->execution->weekend);
diff --git a/module/project/ui/bug.html.php b/module/project/ui/bug.html.php
index 431389bc54..80438876c0 100644
--- a/module/project/ui/bug.html.php
+++ b/module/project/ui/bug.html.php
@@ -10,7 +10,7 @@ declare(strict_types=1);
  */
 namespace zin;
 
-$linkParams = "projectID={$project->id}&productID={$productID}&branch=$branchID&orderBy=status,id_desc&build=$buildID&type={key}" . ($type == 'bysearch' ? '' : "&param=$param");
+$linkParams = "projectID={$project->id}&productID={$productID}&branch=$branchID&orderBy=status,id_desc&build=$buildID&type={key}" . ($type == 'bysearch' ? '' : "&param=$param") . "&recTotal={$pager->recTotal}&recPerpage={$pager->recPerPage}";
 featureBar
 (
     set::current($type),
@@ -29,14 +29,16 @@ toolbar
         'url'   => createLink('bug', 'export', "productID={$productID}&orderBy=$orderBy&browseType=&projectID={$project->id}"),
         'data-toggle' => 'modal'
     ))) : null,
-    $canCreate ? item(set(array
+    $canCreate ? item
     (
-        'text' => $lang->bug->create,
-        'icon' => 'plus',
-        'type' => 'primary',
-        'url'  => createLink('bug', 'create', "productID={$productID}&branch={$branchID}&extras=projectID={$project->id}")
-    )),
-    setData('app', 'project')
+        set(array
+        (
+            'text' => $lang->bug->create,
+            'icon' => 'plus',
+            'type' => 'primary',
+            'url'  => createLink('bug', 'create', "productID={$productID}&branch={$branchID}&extras=projectID={$project->id}")
+        )),
+        setData('app', 'project')
     ) : null
 );
 
@@ -51,7 +53,7 @@ sidebar
     )))
 );
 
-$canBatchAssignTo = common::hasPriv('bug', 'batchAssignTo');
+$canBatchAssignTo = hasPriv('bug', 'batchAssignTo');
 
 $config->bug->dtable->fieldList['module']['map']    = $modulePairs;
 $config->bug->dtable->fieldList['story']['map']     = $stories;