From b8f6593bc296c05451729fa7c58d6aa521bc1b7d Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Thu, 9 Mar 2023 05:57:41 +0000
Subject: [PATCH] * Finish task #86269.

---
 module/group/config.php                       |  7 ++
 module/group/control.php                      | 27 ++++++-
 module/group/css/editmanagepriv.css           |  4 +
 module/group/model.php                        | 74 +++++++++++++++++++
 module/group/view/editmanagepriv.html.php     |  6 +-
 .../group/view/editmanageprivbylist.html.php  | 42 ++++++++++-
 6 files changed, 152 insertions(+), 8 deletions(-)

diff --git a/module/group/config.php b/module/group/config.php
index 9531273972..7c5db1716d 100644
--- a/module/group/config.php
+++ b/module/group/config.php
@@ -17,3 +17,10 @@ $config->privPackage->create = new stdclass();
 $config->privPackage->edit   = new stdclass();
 $config->privPackage->create->requiredFields = 'name,module';
 $config->privPackage->edit->requiredFields   = 'name,module';
+
+global $lang;
+$config->group->priv = new stdclass();
+$config->group->priv->search['module']                   = 'priv';
+$config->group->priv->search['fields']['name']           = $lang->group->name;
+$config->group->priv->search['params']['name']           = array('operator' => 'include', 'control' => 'input',  'values' => '');
+
diff --git a/module/group/control.php b/module/group/control.php
index 9dbc3764eb..16a13585e8 100644
--- a/module/group/control.php
+++ b/module/group/control.php
@@ -384,13 +384,34 @@ class group extends control
    /**
      * edit manage priv.
      *
+     * @param  string $browseType
+     * @param  string $view
+     * @param  int    $paramID
+     * @param  int    $recTotal
+     * @param  int    $recPerPage
+     * @param  int    $pageID
      * @access public
      * @return void
      */
-    public function editManagePriv()
+    public function editManagePriv($browseType = '', $view = '', $paramID = 0, $recTotal = 0, $recPerPage = 100, $pageID = 1)
     {
-        $this->view->title    = $this->lang->group->editManagePriv;
-        $this->view->editType = $this->cookie->managePrivEditType ? $this->cookie->managePrivEditType : 'bycard';
+        if(empty($browseType)) $browseType = $this->cookie->managePrivEditType ? $this->cookie->managePrivEditType : 'bycard';;
+
+        $this->app->loadClass('pager', $static = true);
+        $pager = new pager($recTotal, $recPerPage, $pageID);
+
+        $privList = $browseType != 'bysearch' ? $this->group->getPrivsListByView($view, $pager) :  $this->group->getPrivsListBySearch($pager);
+
+        /* Build the search form. */
+        $queryID   = ($browseType == 'bysearch') ? (int)$paramID : 0;
+        $actionURL = $this->createLink('group', 'editManagePriv', "browseType=bysearch&view=&paramID=myQueryID&recTotal=$recTotal&recPerPage=$recPerPage");
+        $this->group->buildPrivSearchForm($queryID, $actionURL);
+
+        $this->view->title      = $this->lang->group->editManagePriv;
+        $this->view->browseType = $browseType;
+        $this->view->privList   = $privList;
+        $this->view->packages   = $this->group->getPrivPackagesByView($view);
+        $this->view->pager      = $pager;
         $this->display();
     }
 
diff --git a/module/group/css/editmanagepriv.css b/module/group/css/editmanagepriv.css
index 2da9506043..ab30377650 100644
--- a/module/group/css/editmanagepriv.css
+++ b/module/group/css/editmanagepriv.css
@@ -22,3 +22,7 @@
 /* tree */
 .tree ul > li {display: inline-block; width: 50%;}
 .priv-item > .icon {padding-left: 5px;}
+
+#privList .c-view, #privList .c-module, #privList .c-package {width: 100px;}
+#privList .c-privs {width: 180px;}
+#privList .c-actions {width: 50px;}
diff --git a/module/group/model.php b/module/group/model.php
index da810b129d..db80a3c899 100644
--- a/module/group/model.php
+++ b/module/group/model.php
@@ -842,6 +842,19 @@ class groupModel extends model
         return $this->dao->select('*')->from(TABLE_PRIVPACKAGE)->where('module')->eq($module)->orderBy('order_asc')->fetchAll('id');
     }
 
+    /**
+     * Get priv packages by view.
+     *
+     * @param  string $view
+     * @access public
+     * @return void
+     */
+    public function getPrivPackagesByView($view = '')
+    {
+        $modules = $this->setting->getItem("owner=system&module=priv&key={$view}Modules");
+        return $this->dao->select('*')->from(TABLE_PRIVPACKAGE)->where('module')->in($modules)->orderBy('order_asc')->fetchAll('id');
+    }
+
     /**
      * Get priv modules.
      *
@@ -1038,6 +1051,59 @@ class groupModel extends model
             ->fetchGroup('module', 'id');
     }
 
+    /**
+     * Get privs list by module.
+     *
+     * @param  string $view
+     * @param  object $pager
+     * @access public
+     * @return array
+     */
+    public function getPrivsListByView($view = '', $pager = null)
+    {
+        $modules = $this->loadModel('setting')->getItem("owner=system&module=priv&key={$view}Modules");
+        return $this->dao->select('t1.*,t2.name,t2.desc')->from(TABLE_PRIV)->alias('t1')
+            ->leftJoin(TABLE_PRIVLANG)->alias('t2')->on('t1.id=t2.priv')
+            ->where('1=1')
+            ->beginIF(!empty($view))->andWhere('t1.module')->in($modules)->fi()
+            ->andWhere('t2.lang')->eq($this->app->getClientLang())
+            ->orderBy('`order`')
+            ->page($pager)
+            ->fetchAll('id');
+    }
+
+    /**
+     * Get privs list by module.
+     *
+     * @param  int    $queryID
+     * @param  object $pager
+     * @access public
+     * @return array
+     */
+    public function getPrivsListBySearch($queryID = 0, $pager = null)
+    {
+        $query = $queryID ? $this->loadModel('search')->getQuery($queryID) : '';
+
+        /* Get the sql and form status from the query. */
+        if($query)
+        {
+            $this->session->set('privQuery', $query->sql);
+            $this->session->set('privForm', $query->form);
+        }
+        if($this->session->privQuery == false) $this->session->set('privQuery', ' 1 = 1');
+
+        $privQuery = $this->session->privQuery;
+
+        return $this->dao->select('t1.*,t2.name,t2.desc')->from(TABLE_PRIV)->alias('t1')
+            ->leftJoin(TABLE_PRIVLANG)->alias('t2')->on('t1.id=t2.priv')
+            ->where('1=1')
+            ->andWhere($privQuery)
+            ->andWhere('t2.lang')->eq($this->app->getClientLang())
+            ->orderBy('`order`')
+            ->page($pager)
+            ->fetchAll('id');
+    }
+
     /**
      * Get priv relation.
      *
@@ -1082,4 +1148,12 @@ class groupModel extends model
             }
         }
     }
+
+    public function buildPrivSearchForm($queryID, $actionURL)
+    {
+        $this->config->group->priv->search['actionURL'] = $actionURL;
+        $this->config->group->priv->search['queryID']   = $queryID;
+
+        $this->loadModel('search')->setSearchParams($this->config->group->priv->search);
+    }
 }
diff --git a/module/group/view/editmanagepriv.html.php b/module/group/view/editmanagepriv.html.php
index e3581d4fe4..d35956ce29 100644
--- a/module/group/view/editmanagepriv.html.php
+++ b/module/group/view/editmanagepriv.html.php
@@ -18,8 +18,8 @@
   </div>
   <div class="btn-toolbar">
     <div class="btn-group">
-      <a href="#" data-type="bycard" class="btn btn-icon btn-switch <?php if($editType == 'bycard') echo 'text-primary' ?>"><i class="icon icon-cards-view"></i></a>
-      <a href="#" data-type="bylist" class="btn btn-icon btn-switch <?php if($editType == 'bylist') echo 'text-primary' ?>"><i class="icon icon-list"></i></a>
+      <a href="#" data-type="bycard" class="btn btn-icon btn-switch <?php if($browseType == 'bycard') echo 'text-primary' ?>"><i class="icon icon-cards-view"></i></a>
+      <a href="#" data-type="bylist" class="btn btn-icon btn-switch <?php if($browseType == 'bylist' or $browseType == 'bysearch') echo 'text-primary' ?>"><i class="icon icon-list"></i></a>
     </div>
     <a href="#" class="btn btn-primary"><?php echo $lang->group->addPriv?></a>
     <?php if(common::hasPriv('group', 'managePrivPackage')) echo html::a($this->createLink('group', 'managePrivPackage', ''), $lang->group->managePrivPackage, '', 'class="btn btn-primary"');?>
@@ -29,7 +29,7 @@
 <div id='mainContent'>
   <div class="main main-content">
   <?php
-  if($editType == 'bycard')
+  if($browseType == 'bycard')
   {
       include 'editmanageprivbycard.html.php';
   }
diff --git a/module/group/view/editmanageprivbylist.html.php b/module/group/view/editmanageprivbylist.html.php
index 080676effd..576300167f 100644
--- a/module/group/view/editmanageprivbylist.html.php
+++ b/module/group/view/editmanageprivbylist.html.php
@@ -9,6 +9,44 @@
 * @version     $Id: editmanageprivbylist.html.php 4769 2021-07-23 11:16:21Z $
 * @link        https://www.zentao.net
 */
+
+$lang->privp = new stdclass();
+$lang->privp->name    = '权限名称';
+$lang->privp->view    = '视图';
+$lang->privp->module  = '模块';
+$lang->privp->package = '所属权限包';
+$lang->privp->p1      = '依赖权限';
+$lang->privp->p2      = '推荐权限';
+$lang->privp->module  = '模块';
+$lang->privp->desc    = '说明';
 ?>
-
-
+<table class="table has-sort-head" id='privList'>
+  <thead>
+    <tr>
+      <th class="c-name"><?php echo $lang->privp->name;?></th>
+      <th class="c-view"><?php echo $lang->privp->view;?></th>
+      <th class="c-module"><?php echo $lang->privp->module;?></th>
+      <th class="c-package"><?php echo $lang->privp->package;?></th>
+      <th class="c-privs"><?php echo $lang->privp->p1;?></th>
+      <th class="c-privs"><?php echo $lang->privp->p2;?></th>
+      <th class="c-actions-1 text-center"><?php echo $lang->actions;?></th>
+    </tr>
+  </thead>
+  <tbody>
+    <?php foreach($privList as $priv):?>
+    <tr>
+      <td><?php echo $priv->name;?></td>
+      <?php $view = isset($this->lang->navGroup->{$priv->module}) ? $this->lang->navGroup->{$priv->module} : $priv->module;?>
+      <td><?php echo isset($lang->{$view}->common) ? $lang->{$view}->common : $view;?></td>
+      <td><?php echo isset($lang->{$priv->module}->common) ? $lang->{$priv->module}->common : $priv->module;?></td>
+      <td><?php echo zget($packages, $priv->package, '');?></td>
+      <td><?php echo '';?></td>
+      <td><?php echo '';?></td>
+      <td class='c-actions'><?php if(common::hasPriv('group', 'editPriv')) common::printIcon('group', 'editPriv', "privID=$priv->id", '', 'list', 'edit', '', 'iframe', true);?></td>
+    </tr>
+    <?php endforeach;?>
+  </tbody>
+</table>
+<div class='table-footer'>
+  <?php $pager->show('right', 'pagerjs');?>
+</div>