From df822fb318f6c1482f83d356a61cfa7d83fa364e Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Tue, 7 Mar 2023 05:07:09 +0000
Subject: [PATCH] * Finish task #86263.

---
 module/group/config.php                      |  6 +++
 module/group/control.php                     | 10 ++++-
 module/group/css/createprivpackage.en.css    |  1 +
 module/group/lang/de.php                     |  6 +++
 module/group/lang/en.php                     |  6 +++
 module/group/lang/fr.php                     |  6 +++
 module/group/lang/zh-cn.php                  |  6 +++
 module/group/model.php                       | 13 +++++++
 module/group/view/createprivpackage.html.php | 41 ++++++++++++++++++++
 module/group/view/manageprivpackage.html.php |  2 +-
 10 files changed, 95 insertions(+), 2 deletions(-)
 create mode 100644 module/group/css/createprivpackage.en.css
 create mode 100644 module/group/view/createprivpackage.html.php

diff --git a/module/group/config.php b/module/group/config.php
index 27f5d795f7..9531273972 100644
--- a/module/group/config.php
+++ b/module/group/config.php
@@ -11,3 +11,9 @@ $config->group->acl->objectTypes['programs'] = 'program';
 $config->group->acl->objectTypes['projects'] = 'project';
 $config->group->acl->objectTypes['products'] = 'product';
 $config->group->acl->objectTypes['sprints']  = 'sprint';
+
+$config->privPackage = new stdclass();
+$config->privPackage->create = new stdclass();
+$config->privPackage->edit   = new stdclass();
+$config->privPackage->create->requiredFields = 'name,module';
+$config->privPackage->edit->requiredFields   = 'name,module';
diff --git a/module/group/control.php b/module/group/control.php
index 7d5ccdea52..487f6a998c 100644
--- a/module/group/control.php
+++ b/module/group/control.php
@@ -413,7 +413,15 @@ class group extends control
      */
     public function createPrivPackage()
     {
-        $this->view->title = $this->lang->group->createPrivPackage;
+        if(!empty($_POST))
+        {
+            $packageID = $this->group->createPrivPackage();
+            if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
+            return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
+        }
+
+        $this->view->title   = $this->lang->group->createPrivPackage;
+        $this->view->modules = array();
         $this->display();
     }
 }
diff --git a/module/group/css/createprivpackage.en.css b/module/group/css/createprivpackage.en.css
new file mode 100644
index 0000000000..c4eadadd59
--- /dev/null
+++ b/module/group/css/createprivpackage.en.css
@@ -0,0 +1 @@
+#createPrivPackage .c-name {width: 135px;}
diff --git a/module/group/lang/de.php b/module/group/lang/de.php
index 26595ee057..7b13c67042 100644
--- a/module/group/lang/de.php
+++ b/module/group/lang/de.php
@@ -71,6 +71,12 @@ $lang->group->other    = 'Andere';
 $lang->group->all      = 'Alle';
 $lang->group->config   = 'Config';
 
+if(!isset($lang->privPackage)) $lang->privPackage = new stdclass();
+$lang->privPackage->id     = 'ID';
+$lang->privPackage->name   = 'Priv Package Name';
+$lang->privPackage->module = 'Module';
+$lang->privPackage->desc   = 'Priv Package Desc';
+
 $lang->group->copyOptions['copyPriv'] = 'Rechte kopieren';
 $lang->group->copyOptions['copyUser'] = 'Benutzer kopieren';
 
diff --git a/module/group/lang/en.php b/module/group/lang/en.php
index 07966839d2..6a8530e145 100644
--- a/module/group/lang/en.php
+++ b/module/group/lang/en.php
@@ -71,6 +71,12 @@ $lang->group->other    = 'Others';
 $lang->group->all      = 'All Privileges';
 $lang->group->config   = 'Config';
 
+if(!isset($lang->privPackage)) $lang->privPackage = new stdclass();
+$lang->privPackage->id     = 'ID';
+$lang->privPackage->name   = 'Priv Package Name';
+$lang->privPackage->module = 'Module';
+$lang->privPackage->desc   = 'Priv Package Desc';
+
 $lang->group->copyOptions['copyPriv'] = 'Copy Privileges';
 $lang->group->copyOptions['copyUser'] = 'Copy Users';
 
diff --git a/module/group/lang/fr.php b/module/group/lang/fr.php
index 89941b7071..b09f56a893 100644
--- a/module/group/lang/fr.php
+++ b/module/group/lang/fr.php
@@ -71,6 +71,12 @@ $lang->group->other    = 'Autres';
 $lang->group->all      = 'Tous les Privilèges';
 $lang->group->config   = 'Config';
 
+if(!isset($lang->privPackage)) $lang->privPackage = new stdclass();
+$lang->privPackage->id     = 'ID';
+$lang->privPackage->name   = 'Priv Package Name';
+$lang->privPackage->module = 'Module';
+$lang->privPackage->desc   = 'Priv Package Desc';
+
 $lang->group->copyOptions['copyPriv'] = 'Copier Privilèges';
 $lang->group->copyOptions['copyUser'] = 'Copier Utilisateurs';
 
diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php
index 18c16e9013..ed5d63fc63 100644
--- a/module/group/lang/zh-cn.php
+++ b/module/group/lang/zh-cn.php
@@ -71,6 +71,12 @@ $lang->group->other    = '其他模块';
 $lang->group->all      = '所有权限';
 $lang->group->config   = '配置';
 
+if(!isset($lang->privpackage)) $lang->privpackage = new stdclass();
+$lang->privpackage->id     = '编号';
+$lang->privpackage->name   = '权限包名称';
+$lang->privpackage->module = '所属模块';
+$lang->privpackage->desc   = '权限包说明';
+
 $lang->group->copyOptions['copyPriv'] = '复制权限';
 $lang->group->copyOptions['copyUser'] = '复制用户';
 
diff --git a/module/group/model.php b/module/group/model.php
index 3ab0e853df..fdcdc10a15 100644
--- a/module/group/model.php
+++ b/module/group/model.php
@@ -755,4 +755,17 @@ class groupModel extends model
 
         return true;
     }
+
+    /**
+     * Create a privilege package.
+     *
+     * @access public
+     * @return bool
+     */
+    public function createPrivPackage()
+    {
+        $package = fixer::input('post')->get();
+        $this->dao->insert(TABLE_PRIVPACKAGE)->data($package)->batchCheck($this->config->privPackage->create->requiredFields, 'notempty')->exec();
+        return $this->dao->lastInsertId();
+    }
 }
diff --git a/module/group/view/createprivpackage.html.php b/module/group/view/createprivpackage.html.php
new file mode 100644
index 0000000000..50b9b86b27
--- /dev/null
+++ b/module/group/view/createprivpackage.html.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * The createPrivPackage view file of group module of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2023 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) Co., Ltd. www.cnezsoft.com)
+ * @license     ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
+ * @author      Mengyi Liu <liumengyi@easycorp.ltd>
+ * @package     group
+ * @version     $Id: createprivpackage.html.php 4769 2023-03-07 10:09:21Z liumengyi $
+ * @link        https://www.zentao.net
+ */
+?>
+<?php include '../../common/view/header.html.php';?>
+<div id='mainContent' class='main-content'>
+  <div class='main-header'>
+    <h2><?php echo $lang->group->createPrivPackage;?></h2>
+  </div>
+  <form method='post' class='main-form form-ajax' id='createPrivPackage'>
+    <table align='center' class='table table-form'>
+      <tbody>
+      <tr>
+        <th class='c-name'><?php echo $lang->privpackage->name;?></th>
+        <td class='required'><?php echo html::input('name', '', "class='form-control'");?></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->privpackage->module;?></th>
+        <td class='required'><?php echo html::select('module', $modules, '', "class='form-control picker-select'");?></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->privpackage->desc;?></th>
+        <td><?php echo html::textarea('desc', '', "rows=5 class=form-control");?></td>
+      </tr>
+      <tr>
+        <td colspan='2' class='text-center'><?php echo html::submitButton();?></td>
+      </tr>
+      </tbody>
+    </table>
+  </form>
+</div>
+<?php include '../../common/view/footer.html.php';?>
+
diff --git a/module/group/view/manageprivpackage.html.php b/module/group/view/manageprivpackage.html.php
index 92ee5d17a9..e96edd4733 100644
--- a/module/group/view/manageprivpackage.html.php
+++ b/module/group/view/manageprivpackage.html.php
@@ -20,7 +20,7 @@
     </div>
   </div>
   <div class="btn-toolbar pull-right">
-    <?php if(common::hasPriv('group', 'createPrivPackage')) echo html::a($this->createLink('group', 'createPrivPackage', '', '', true), $lang->group->createPrivPackage, '', 'class="btn btn-primary iframe"');?>
+    <?php if(common::hasPriv('group', 'createPrivPackage')) echo html::a($this->createLink('group', 'createPrivPackage', '', '', true), $lang->group->createPrivPackage, '', 'class="btn btn-primary iframe" data-width="500"');?>
   </div>
 </div>
 <div id='mainContent' class='main-table'>