* Finish task #86267.

module/group/control.php

@@ -453,4 +453,27 @@ class group extends control
         $this->view->users       = $this->loadModel('user')->getPairs();
         $this->display();
     }
+
+    /**
+     * Delete a priv package.
+     *
+     * @param  int    $privPackageID
+     * @access public
+     * @return void
+     */
+    public function deletePrivPackage($privPackageID, $confirm = 'no')
+    {
+        if($confirm == 'no')
+        {
+            return print(js::confirm($this->lang->group->confirmDeleteAB, $this->createLink('group', 'deletePrivPackage', "privPackageID=$privPackageID&confirm=yes")));
+        }
+        else
+        {
+            $this->group->deletePrivPackage($privPackageID);
+            if(!dao::isError()) $this->loadModel('action')->create('privpackage', $privPackageID, 'deleted');
+
+            return print(js::reload('parent'));
+        }
+
+    }
 }

module/group/lang/de.php

@@ -25,6 +25,7 @@ $lang->group->manageMember       = 'Mitglieder';
 $lang->group->manageProjectAdmin = 'Manage Program Admins';
 $lang->group->permissionedit     = 'Permission Edit';
 $lang->group->confirmDelete      = "Do you want to delete '%s'?";
+$lang->group->confirmDeleteAB    = 'Do you want to delete this?';
 $lang->group->successSaved       = 'Gespeichert!';
 $lang->group->errorNotSaved      = 'Fehlgeschlagen. Bitte aktion und Gruppe wählen.';
 $lang->group->viewList           = 'Anzeige ist zulässig.';

module/group/lang/en.php

@@ -25,6 +25,7 @@ $lang->group->manageMember       = 'Manage Members';
 $lang->group->manageProjectAdmin = 'Manage Program Admins';
 $lang->group->permissionedit     = 'Permission Edit';
 $lang->group->confirmDelete      = "Do you want to delete '%s'?";
+$lang->group->confirmDeleteAB    = 'Do you want to delete this?';
 $lang->group->successSaved       = 'Saved.';
 $lang->group->errorNotSaved      = 'Failed. Please select actions and groups.';
 $lang->group->viewList           = 'Access Sight';

module/group/lang/fr.php

@@ -25,6 +25,7 @@ $lang->group->manageMember       = 'Gérer Membres';
 $lang->group->manageProjectAdmin = 'Manage Program Admins';
 $lang->group->permissionedit     = 'Permission Edit';
 $lang->group->confirmDelete      = "Voulez - vous supprimer '%s'?";
+$lang->group->confirmDeleteAB    = 'Do you want to delete this?';
 $lang->group->successSaved       = 'Sauvé.';
 $lang->group->errorNotSaved      = 'Echec. Veuillez sélectionner actions et groupes.';
 $lang->group->viewList           = 'Accès Consultation';

module/group/lang/zh-cn.php

@@ -25,6 +25,7 @@ $lang->group->manageMember       = '成员维护';
 $lang->group->manageProjectAdmin = '维护项目管理员';
 $lang->group->permissionedit     = '维护权限';
 $lang->group->confirmDelete      = '您确定删除“%s”用户分组吗？';
+$lang->group->confirmDeleteAB    = '您确定删除吗？';
 $lang->group->successSaved       = '成功保存';
 $lang->group->errorNotSaved      = '没有保存，请确认选择了权限数据。';
 $lang->group->viewList           = '可访问视图';

module/group/model.php

@@ -802,6 +802,13 @@ class groupModel extends model
         return $changes;
     }
 
+    public function deletePrivPackage($packageID)
+    {
+        $this->dao->delete()->from(TABLE_PRIVPACKAGE)->where('id')->eq($packageID)->exec();
+        if(dao::isError()) return false;
+        $this->dao->update(TABLE_PRIV)->set('package')->eq(0)->where('package')->eq($packageID)->exec();
+    }
+
     /**
      * Get priv package by ID.
      *

module/group/view/manageprivpackage.html.php

@@ -42,8 +42,12 @@
         <tr <?php echo "data-id='$package->id' data-order='$package->order' data-parent='$package->parent' data-level='$package->grade' data-nest-parent='$package->parent' data-nest-path='$package->path'"?>>
           <td class='text-left has-prefix' title='<?php echo $package->name?>'><?php echo $package->name?></td>
           <td class='text-left' title='<?php echo $package->desc?>'><?php echo $package->desc?></td>
-          <td></td>
+          <td><?php if(common::hasPriv('group', 'privPackageSort')) echo '<a class="sort-handler"><i class="icon-move"></i></a>';?></td>
           <td class='c-actions'>
+            <?php
+            if(common::hasPriv('group', 'editPrivPackage') and $package->grade == 3) common::printIcon('group', 'editPrivPackage', "packageID=$package->id", '', 'list', 'edit', '', 'iframe', true);
+            if(common::hasPriv('group', 'deletePrivPackage') and $package->grade == 3) common::printIcon('group', 'deletePrivPackage', "packageID=$package->id", '', 'list', 'trash', 'hiddenwin');
+            ?>
           </td>
         </tr>
         <?php endforeach;?>