From ede1a0b7982585230d575562f0502e7716629152 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Wed, 7 Dec 2016 09:07:48 +0800
Subject: [PATCH]  * adjust priv.

---
 db/zentao.sql            | 25 +++++++++++++++++++++++++
 module/upgrade/model.php | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+)

diff --git a/db/zentao.sql b/db/zentao.sql
index 1297ff59b8..70e8e9881f 100644
--- a/db/zentao.sql
+++ b/db/zentao.sql
@@ -941,6 +941,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (1, 'product', 'view'),
 (1, 'product', 'updateOrder'),
 (1, 'branch', 'manage'),
+(1, 'branch', 'sort'),
 (1, 'branch', 'delete'),
 (1, 'productplan', 'batchUnlinkBug'),
 (1, 'productplan', 'batchUnlinkStory'),
@@ -1036,6 +1037,8 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (1, 'story', 'report'),
 (1, 'story', 'review'),
 (1, 'story', 'tasks'),
+(1, 'story', 'bugs'),
+(1, 'story', 'cases'),
 (1, 'story', 'view'),
 (1, 'story', 'zeroCase'),
 (1, 'svn', 'apiSync'),
@@ -1247,6 +1250,8 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (2, 'story', 'export'),
 (2, 'story', 'report'),
 (2, 'story', 'tasks'),
+(2, 'story', 'bugs'),
+(2, 'story', 'cases'),
 (2, 'story', 'view'),
 (2, 'svn', 'apiSync'),
 (2, 'svn', 'cat'),
@@ -1419,6 +1424,8 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (3, 'story', 'export'),
 (3, 'story', 'report'),
 (3, 'story', 'tasks'),
+(3, 'story', 'bugs'),
+(3, 'story', 'cases'),
 (3, 'story', 'view'),
 (3, 'story', 'zeroCase'),
 (3, 'svn', 'apiSync'),
@@ -1652,6 +1659,8 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (4, 'story', 'export'),
 (4, 'story', 'report'),
 (4, 'story', 'tasks'),
+(4, 'story', 'bugs'),
+(4, 'story', 'cases'),
 (4, 'story', 'view'),
 (4, 'story', 'zeroCase'),
 (4, 'svn', 'apiSync'),
@@ -1816,6 +1825,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (5, 'product', 'view'),
 (5, 'product', 'updateOrder'),
 (5, 'branch', 'manage'),
+(5, 'branch', 'sort'),
 (5, 'branch', 'delete'),
 (5, 'productplan', 'batchUnlinkBug'),
 (5, 'productplan', 'batchUnlinkStory'),
@@ -1910,6 +1920,8 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (5, 'story', 'report'),
 (5, 'story', 'review'),
 (5, 'story', 'tasks'),
+(5, 'story', 'bugs'),
+(5, 'story', 'cases'),
 (5, 'story', 'view'),
 (5, 'story', 'zeroCase'),
 (5, 'svn', 'apiSync'),
@@ -2114,6 +2126,8 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (6, 'story', 'export'),
 (6, 'story', 'report'),
 (6, 'story', 'tasks'),
+(6, 'story', 'bugs'),
+(6, 'story', 'cases'),
 (6, 'story', 'view'),
 (6, 'story', 'zeroCase'),
 (6, 'svn', 'apiSync'),
@@ -2276,6 +2290,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (7, 'product', 'view'),
 (7, 'product', 'updateOrder'),
 (7, 'branch', 'manage'),
+(7, 'branch', 'sort'),
 (7, 'branch', 'delete'),
 (7, 'productplan', 'batchUnlinkBug'),
 (7, 'productplan', 'batchUnlinkStory'),
@@ -2354,6 +2369,8 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (7, 'story', 'report'),
 (7, 'story', 'review'),
 (7, 'story', 'tasks'),
+(7, 'story', 'bugs'),
+(7, 'story', 'cases'),
 (7, 'story', 'view'),
 (7, 'story', 'zeroCase'),
 (7, 'svn', 'apiSync'),
@@ -2533,6 +2550,8 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (8, 'story', 'export'),
 (8, 'story', 'report'),
 (8, 'story', 'tasks'),
+(8, 'story', 'bugs'),
+(8, 'story', 'cases'),
 (8, 'story', 'view'),
 (8, 'story', 'zeroCase'),
 (8, 'svn', 'apiSync'),
@@ -2734,6 +2753,8 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (9, 'story', 'report'),
 (9, 'story', 'review'),
 (9, 'story', 'tasks'),
+(9, 'story', 'bugs'),
+(9, 'story', 'cases'),
 (9, 'story', 'view'),
 (9, 'story', 'zeroCase'),
 (9, 'svn', 'apiSync'),
@@ -2859,6 +2880,8 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (10, 'search', 'deleteQuery'),
 (10, 'search', 'saveQuery'),
 (10, 'story', 'tasks'),
+(10, 'story', 'bugs'),
+(10, 'story', 'cases'),
 (10, 'story', 'view'),
 (10, 'task', 'deleteEstimate'),
 (10, 'task', 'editEstimate'),
@@ -2943,6 +2966,8 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (11, 'search', 'buildForm'),
 (11, 'search', 'buildQuery'),
 (11, 'story', 'tasks'),
+(11, 'story', 'bugs'),
+(11, 'story', 'cases'),
 (11, 'story', 'view'),
 (11, 'svn', 'cat'),
 (11, 'svn', 'diff'),
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index accec0b26d..9ef71d4db6 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -157,6 +157,7 @@ class upgradeModel extends model
             case '8_3_1':
                 $this->execSQL($this->getUpgradeFile('8.3.1'));
                 $this->renameMainLib();
+                $this->adjustPriv8_4();
         }
 
         $this->deletePatch();
@@ -1453,6 +1454,38 @@ class upgradeModel extends model
         return true;
     }
 
+    /**
+     * Adjust priv for 8.4.
+     * 
+     * @access public
+     * @return bool
+     */
+    public function adjustPriv8_4()
+    {
+        $groups = $this->dao->select('`group`')->from(TABLE_GROUPPRIV)->where('module')->eq('branch')->andWhere('method')->eq('manage')->fetchPairs('group', 'group');
+        foreach($groups as $groupID)
+        {
+            $data = new stdclass();
+            $data->group = $groupID;
+            $data->module = 'branch';
+            $data->method = 'sort';
+            $this->dao->replace(TABLE_GROUPPRIV)->data($data)->exec();
+        }
+        $groups = $this->dao->select('`group`')->from(TABLE_GROUPPRIV)->where('module')->eq('story')->andWhere('method')->eq('tasks')->fetchPairs('group', 'group');
+        foreach($groups as $groupID)
+        {
+            $data = new stdclass();
+            $data->group = $groupID;
+            $data->module = 'story';
+            $data->method = 'bugs';
+            $this->dao->replace(TABLE_GROUPPRIV)->data($data)->exec();
+
+            $data->method = 'cases';
+            $this->dao->replace(TABLE_GROUPPRIV)->data($data)->exec();
+        }
+        return true;
+    }
+
     /**
      * Judge any error occers.
      *