From 11bfcda1905255a928d481a06a5ce09a558b783e Mon Sep 17 00:00:00 2001
From: wyd621 <wyd621@163.com>
Date: Wed, 19 Mar 2014 05:52:47 +0000
Subject: [PATCH]  * add priv for bug-batchClose.

---
 db/zentao.sql                  |  8 ++++++
 module/bug/lang/en.php         |  1 +
 module/bug/lang/zh-cn.php      |  1 +
 module/group/lang/en.php       |  1 +
 module/group/lang/resource.php | 45 +++++++++++++++++++---------------
 module/group/lang/zh-cn.php    |  1 +
 6 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/db/zentao.sql b/db/zentao.sql
index aec91954d8..4d95a9d17c 100644
--- a/db/zentao.sql
+++ b/db/zentao.sql
@@ -675,6 +675,7 @@ INSERT INTO `zt_groupPriv` (`group`, `module`, `method`) VALUES
 (1, 'bug', 'activate'),
 (1, 'bug', 'assignTo'),
 (1, 'bug', 'batchEdit'),
+(1, 'bug', 'batchClose'),
 (1, 'bug', 'browse'),
 (1, 'bug', 'close'),
 (1, 'bug', 'confirmBug'),
@@ -946,6 +947,7 @@ INSERT INTO `zt_groupPriv` (`group`, `module`, `method`) VALUES
 (2, 'bug', 'activate'),
 (2, 'bug', 'assignTo'),
 (2, 'bug', 'batchEdit'),
+(2, 'bug', 'batchClose'),
 (2, 'bug', 'browse'),
 (2, 'bug', 'close'),
 (2, 'bug', 'confirmBug'),
@@ -1094,6 +1096,7 @@ INSERT INTO `zt_groupPriv` (`group`, `module`, `method`) VALUES
 (3, 'bug', 'activate'),
 (3, 'bug', 'assignTo'),
 (3, 'bug', 'batchEdit'),
+(3, 'bug', 'batchClose'),
 (3, 'bug', 'browse'),
 (3, 'bug', 'close'),
 (3, 'bug', 'confirmBug'),
@@ -1267,6 +1270,7 @@ INSERT INTO `zt_groupPriv` (`group`, `module`, `method`) VALUES
 (4, 'bug', 'activate'),
 (4, 'bug', 'assignTo'),
 (4, 'bug', 'batchEdit'),
+(4, 'bug', 'batchClose'),
 (4, 'bug', 'browse'),
 (4, 'bug', 'close'),
 (4, 'bug', 'confirmBug'),
@@ -1453,6 +1457,7 @@ INSERT INTO `zt_groupPriv` (`group`, `module`, `method`) VALUES
 (5, 'bug', 'activate'),
 (5, 'bug', 'assignTo'),
 (5, 'bug', 'batchEdit'),
+(5, 'bug', 'batchClose'),
 (5, 'bug', 'browse'),
 (5, 'bug', 'close'),
 (5, 'bug', 'confirmBug'),
@@ -1630,6 +1635,7 @@ INSERT INTO `zt_groupPriv` (`group`, `module`, `method`) VALUES
 (6, 'bug', 'activate'),
 (6, 'bug', 'assignTo'),
 (6, 'bug', 'batchEdit'),
+(6, 'bug', 'batchClose'),
 (6, 'bug', 'browse'),
 (6, 'bug', 'close'),
 (6, 'bug', 'confirmBug'),
@@ -1810,6 +1816,7 @@ INSERT INTO `zt_groupPriv` (`group`, `module`, `method`) VALUES
 (7, 'bug', 'activate'),
 (7, 'bug', 'assignTo'),
 (7, 'bug', 'batchEdit'),
+(7, 'bug', 'batchClose'),
 (7, 'bug', 'browse'),
 (7, 'bug', 'close'),
 (7, 'bug', 'confirmBug'),
@@ -1987,6 +1994,7 @@ INSERT INTO `zt_groupPriv` (`group`, `module`, `method`) VALUES
 (8, 'bug', 'activate'),
 (8, 'bug', 'assignTo'),
 (8, 'bug', 'batchEdit'),
+(8, 'bug', 'batchClose'),
 (8, 'bug', 'browse'),
 (8, 'bug', 'close'),
 (8, 'bug', 'confirmBug'),
diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php
index e4ed89c083..31a21ade70 100644
--- a/module/bug/lang/en.php
+++ b/module/bug/lang/en.php
@@ -76,6 +76,7 @@ $lang->bug->confirmBug         = 'Confirm Bug';
 $lang->bug->batchConfirm       = 'Batch confirm';
 $lang->bug->edit               = 'Edit Bug';
 $lang->bug->batchEdit          = 'Batch edit';
+$lang->bug->batchClose         = 'Batch close';
 $lang->bug->assignTo           = 'Assign';
 $lang->bug->browse             = 'Browse Bug';
 $lang->bug->view               = 'Bug Info';
diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php
index b20f15e00e..2134ba601e 100644
--- a/module/bug/lang/zh-cn.php
+++ b/module/bug/lang/zh-cn.php
@@ -76,6 +76,7 @@ $lang->bug->confirmBug         = '确认';
 $lang->bug->batchConfirm       = '批量确认';
 $lang->bug->edit               = '编辑';
 $lang->bug->batchEdit          = '批量编辑';
+$lang->bug->batchClose         = '批量关闭';
 $lang->bug->assignTo           = '指派';
 $lang->bug->browse             = 'Bug列表';
 $lang->bug->view               = 'Bug详情';
diff --git a/module/group/lang/en.php b/module/group/lang/en.php
index eca5b28531..168e08a38a 100644
--- a/module/group/lang/en.php
+++ b/module/group/lang/en.php
@@ -43,6 +43,7 @@ $lang->group->copyOptions['copyPriv'] = 'Copy priviledge';
 $lang->group->copyOptions['copyUser'] = 'Copy user';
 
 $lang->group->versions['']          = 'History';
+$lang->group->versions['5_3']       = 'Zentao 5.3';
 $lang->group->versions['5_1']       = 'Zentao 5.1';
 $lang->group->versions['5_0_beta2'] = 'Zentao 5.0.beta2';
 $lang->group->versions['5_0_beta1'] = 'Zentao 5.0.beta1';
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 5fa36f81a5..7a83ac930d 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -360,6 +360,7 @@ $lang->resource->bug->batchConfirm       = 'batchConfirm';
 $lang->resource->bug->view               = 'view';
 $lang->resource->bug->edit               = 'edit';
 $lang->resource->bug->batchEdit          = 'batchEdit';
+$lang->resource->bug->batchClose         = 'batchClose';
 $lang->resource->bug->assignTo           = 'assignTo';
 $lang->resource->bug->resolve            = 'resolve';
 $lang->resource->bug->batchResolve       = 'batchResolve';
@@ -373,26 +374,28 @@ $lang->resource->bug->saveTemplate       = 'saveTemplate';
 $lang->resource->bug->deleteTemplate     = 'deleteTemplate';
 $lang->resource->bug->customFields       = 'customFields';
 
-$lang->bug->methodOrder[0]  = 'index';
-$lang->bug->methodOrder[5]  = 'browse';
-$lang->bug->methodOrder[10] = 'create';
-$lang->bug->methodOrder[15] = 'batchCreate';
-$lang->bug->methodOrder[20] = 'confirmBug';
-$lang->bug->methodOrder[25] = 'batchConfirm';
-$lang->bug->methodOrder[30] = 'view';
-$lang->bug->methodOrder[35] = 'edit';
-$lang->bug->methodOrder[40] = 'assignTo';
-$lang->bug->methodOrder[45] = 'resolve';
-$lang->bug->methodOrder[50] = 'batchResolve';
-$lang->bug->methodOrder[55] = 'activate';
-$lang->bug->methodOrder[60] = 'close';
-$lang->bug->methodOrder[65] = 'report';
-$lang->bug->methodOrder[70] = 'export';
-$lang->bug->methodOrder[75] = 'confirmStoryChange';
-$lang->bug->methodOrder[80] = 'delete';
-$lang->bug->methodOrder[85] = 'saveTemplate';
-$lang->bug->methodOrder[90] = 'deleteTemplate';
-$lang->bug->methodOrder[95] = 'customFields';
+$lang->bug->methodOrder[0]   = 'index';
+$lang->bug->methodOrder[5]   = 'browse';
+$lang->bug->methodOrder[10]  = 'create';
+$lang->bug->methodOrder[15]  = 'batchCreate';
+$lang->bug->methodOrder[20]  = 'batchEdit';
+$lang->bug->methodOrder[25]  = 'confirmBug';
+$lang->bug->methodOrder[30]  = 'batchConfirm';
+$lang->bug->methodOrder[35]  = 'view';
+$lang->bug->methodOrder[40]  = 'edit';
+$lang->bug->methodOrder[45]  = 'assignTo';
+$lang->bug->methodOrder[50]  = 'resolve';
+$lang->bug->methodOrder[55]  = 'batchResolve';
+$lang->bug->methodOrder[60]  = 'batchClose';
+$lang->bug->methodOrder[65]  = 'activate';
+$lang->bug->methodOrder[70]  = 'close';
+$lang->bug->methodOrder[75]  = 'report';
+$lang->bug->methodOrder[80]  = 'export';
+$lang->bug->methodOrder[85]  = 'confirmStoryChange';
+$lang->bug->methodOrder[90]  = 'delete';
+$lang->bug->methodOrder[95]  = 'saveTemplate';
+$lang->bug->methodOrder[100] = 'deleteTemplate';
+$lang->bug->methodOrder[105] = 'customFields';
 
 /* Test case. */
 $lang->resource->testcase = new stdclass();
@@ -954,3 +957,5 @@ $lang->changelog['5.0.beta1'][] = 'custom-restore';
 $lang->changelog['5.0.beta2'][] = 'git-diff';
 $lang->changelog['5.0.beta2'][] = 'git-cat';
 $lang->changelog['5.0.beta2'][] = 'git-apiSync';
+
+$lang->changelog['5.3'][] = 'bug-batchClose';
diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php
index acc8db0c37..0cd73a7c08 100644
--- a/module/group/lang/zh-cn.php
+++ b/module/group/lang/zh-cn.php
@@ -43,6 +43,7 @@ $lang->group->copyOptions['copyPriv'] = '复制权限';
 $lang->group->copyOptions['copyUser'] = '复制用户';
 
 $lang->group->versions['']          = '修改历史';
+$lang->group->versions['5_3']       = '禅道5.3';
 $lang->group->versions['5_1']       = '禅道5.1';
 $lang->group->versions['5_0_beta2'] = '禅道5.0.beta2';
 $lang->group->versions['5_0_beta1'] = '禅道5.0.beta1';