From 453074044c408c48b265bb8e2e6ba28f9af83235 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Mon, 16 Jan 2017 14:15:41 +0800 Subject: [PATCH] * adjust for priv. --- db/zentao.sql | 11 +++++++++++ module/admin/lang/en.php | 1 - module/group/lang/resource.php | 11 +++++++++-- module/upgrade/model.php | 33 +++++++++++++++++++++++++++++++++ tools/check.php | 1 + 5 files changed, 54 insertions(+), 3 deletions(-) diff --git a/db/zentao.sql b/db/zentao.sql index a484f473d7..4130c49dbe 100644 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -903,6 +903,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1, 'mail', 'batchDelete'), (1, 'mail', 'browse'), (1, 'mail', 'delete'), +(1, 'mail', 'resend'), (1, 'mail', 'detect'), (1, 'mail', 'edit'), (1, 'mail', 'index'), @@ -1071,6 +1072,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1, 'testcase', 'batchDelete'), (1, 'testcase', 'batchEdit'), (1, 'testcase', 'browse'), +(1, 'testcase', 'bugs'), (1, 'testcase', 'confirmChange'), (1, 'testcase', 'confirmStoryChange'), (1, 'testcase', 'create'), @@ -1279,6 +1281,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (2, 'task', 'start'), (2, 'task', 'view'), (2, 'testcase', 'browse'), +(2, 'testcase', 'bugs'), (2, 'testcase', 'export'), (2, 'testcase', 'groupCase'), (2, 'testcase', 'index'), @@ -1456,6 +1459,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (3, 'testcase', 'batchCreate'), (3, 'testcase', 'batchEdit'), (3, 'testcase', 'browse'), +(3, 'testcase', 'bugs'), (3, 'testcase', 'confirmChange'), (3, 'testcase', 'confirmStoryChange'), (3, 'testcase', 'create'), @@ -1690,6 +1694,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (4, 'task', 'start'), (4, 'task', 'view'), (4, 'testcase', 'browse'), +(4, 'testcase', 'bugs'), (4, 'testcase', 'createBug'), (4, 'testcase', 'export'), (4, 'testcase', 'groupCase'), @@ -1935,6 +1940,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (5, 'task', 'report'), (5, 'task', 'view'), (5, 'testcase', 'browse'), +(5, 'testcase', 'bugs'), (5, 'testcase', 'createBug'), (5, 'testcase', 'export'), (5, 'testcase', 'groupCase'), @@ -2157,6 +2163,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (6, 'task', 'start'), (6, 'task', 'view'), (6, 'testcase', 'browse'), +(6, 'testcase', 'bugs'), (6, 'testcase', 'export'), (6, 'testcase', 'groupCase'), (6, 'testcase', 'index'), @@ -2384,6 +2391,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (7, 'task', 'report'), (7, 'task', 'view'), (7, 'testcase', 'browse'), +(7, 'testcase', 'bugs'), (7, 'testcase', 'createBug'), (7, 'testcase', 'export'), (7, 'testcase', 'groupCase'), @@ -2584,6 +2592,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (8, 'testcase', 'batchDelete'), (8, 'testcase', 'batchEdit'), (8, 'testcase', 'browse'), +(8, 'testcase', 'bugs'), (8, 'testcase', 'confirmChange'), (8, 'testcase', 'confirmStoryChange'), (8, 'testcase', 'create'), @@ -2767,6 +2776,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (9, 'task', 'report'), (9, 'task', 'view'), (9, 'testcase', 'browse'), +(9, 'testcase', 'bugs'), (9, 'testcase', 'export'), (9, 'testcase', 'groupCase'), (9, 'testcase', 'index'), @@ -2974,6 +2984,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (11, 'task', 'recordEstimate'), (11, 'task', 'view'), (11, 'testcase', 'browse'), +(11, 'testcase', 'bugs'), (11, 'testcase', 'groupCase'), (11, 'testcase', 'index'), (11, 'testcase', 'view'), diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php index 21e0eb4cad..d37e6fa4f9 100644 --- a/module/admin/lang/en.php +++ b/module/admin/lang/en.php @@ -60,7 +60,6 @@ $lang->admin->safe->modeList[2] = 'Strong'; $lang->admin->safe->modeRuleList[1] = 'Should be contain letters and numbers, at lease six characters.'; $lang->admin->safe->modeRuleList[2] = 'Should be contain letters, numbers and special characters, at lease 10 characters.'; - $lang->admin->safe->reasonList['weak'] = 'Common Weak Password'; $lang->admin->safe->reasonList['account'] = 'Same as your account'; $lang->admin->safe->reasonList['mobile'] = 'Same as your mobile number'; diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index b18e4345d1..f62996de16 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -512,6 +512,7 @@ $lang->resource->testcase->showImport = 'showImport'; $lang->resource->testcase->confirmChange = 'confirmChange'; $lang->resource->testcase->confirmStoryChange = 'confirmStoryChange'; $lang->resource->testcase->batchChangeModule = 'batchChangeModule'; +$lang->resource->testcase->bugs = 'bugs'; $lang->testcase->methodOrder[0] = 'index'; $lang->testcase->methodOrder[5] = 'browse'; @@ -530,6 +531,7 @@ $lang->testcase->methodOrder[65] = 'batchDelete'; $lang->testcase->methodOrder[70] = 'batchChangeModule'; $lang->testcase->methodOrder[75] = 'linkCases'; $lang->testcase->methodOrder[80] = 'unlinkCase'; +$lang->testcase->methodOrder[85] = 'bugs'; /* Test task. */ $lang->resource->testtask = new stdclass(); @@ -609,6 +611,7 @@ $lang->resource->mail->test = 'test'; $lang->resource->mail->reset = 'reset'; $lang->resource->mail->browse = 'browse'; $lang->resource->mail->delete = 'delete'; +$lang->resource->mail->resend = 'resend'; $lang->resource->mail->batchDelete = 'batchDelete'; $lang->resource->mail->sendCloud = 'sendCloud'; $lang->resource->mail->sendcloudUser = 'sendcloudUser'; @@ -622,8 +625,9 @@ $lang->mail->methodOrder[30] = 'reset'; $lang->mail->methodOrder[35] = 'browse'; $lang->mail->methodOrder[40] = 'delete'; $lang->mail->methodOrder[45] = 'batchDelete'; -$lang->mail->methodOrder[50] = 'sendCloud'; -$lang->mail->methodOrder[55] = 'sendcloudUser'; +$lang->mail->methodOrder[50] = 'resend'; +$lang->mail->methodOrder[55] = 'sendCloud'; +$lang->mail->methodOrder[60] = 'sendcloudUser'; /* custom. */ $lang->resource->custom = new stdclass(); @@ -1192,3 +1196,6 @@ $lang->changelog['8.3'][] = 'doc-showFiles'; $lang->changelog['8.4'][] = 'branch-sort'; $lang->changelog['8.4'][] = 'story-bugs'; $lang->changelog['8.4'][] = 'story-cases'; + +$lang->changelog['9.0'][] = 'testcase-bugs'; +$lang->changelog['9.0'][] = 'mail-resend'; diff --git a/module/upgrade/model.php b/module/upgrade/model.php index ccc7523859..92ec6bf395 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -161,6 +161,9 @@ class upgradeModel extends model case '8_4': case '8_4_1': $this->execSQL($this->getUpgradeFile('8.4.1')); + case '9_0_beta': + $this->execSQL($this->getUpgradeFile('9.0.beta')); + $this->adjustPriv9_0(); } $this->deletePatch(); @@ -247,6 +250,7 @@ class upgradeModel extends model case '8_3_1': $confirmContent .= file_get_contents($this->getUpgradeFile('8.3.1')); case '8_4': case '8_4_1': $confirmContent .= file_get_contents($this->getUpgradeFile('8.4.1')); + case '9_0_beta': $confirmContent .= file_get_contents($this->getUpgradeFile('9.0.beta')); } return str_replace('zt_', $this->config->db->prefix, $confirmContent); } @@ -1491,6 +1495,35 @@ class upgradeModel extends model return true; } + /** + * Adjust priv for 9.0 + * + * @access public + * @return void + */ + public function adjustPriv9_0() + { + $groups = $this->dao->select('`group`')->from(TABLE_GROUPPRIV)->where('module')->eq('testtask')->andWhere('method')->eq('results')->fetchPairs('group', 'group'); + foreach($groups as $groupID) + { + $data = new stdclass(); + $data->group = $groupID; + $data->module = 'testcase'; + $data->method = 'bugs'; + $this->dao->replace(TABLE_GROUPPRIV)->data($data)->exec(); + } + $groups = $this->dao->select('`group`')->from(TABLE_GROUPPRIV)->where('module')->eq('mail')->andWhere('method')->eq('delete')->fetchPairs('group', 'group'); + foreach($groups as $groupID) + { + $data = new stdclass(); + $data->group = $groupID; + $data->module = 'mail'; + $data->method = 'resend'; + $this->dao->replace(TABLE_GROUPPRIV)->data($data)->exec(); + } + return true; + } + /** * Judge any error occers. * diff --git a/tools/check.php b/tools/check.php index a4e8051f12..939a9532e1 100755 --- a/tools/check.php +++ b/tools/check.php @@ -56,6 +56,7 @@ $whiteList[] = 'admin-win2unix'; $whiteList[] = 'admin-bind'; $whiteList[] = 'admin-certifyztemail'; $whiteList[] = 'admin-certifyztmobile'; +$whiteList[] = 'admin-ztcompany'; $whiteList[] = 'story-commonaction'; $whiteList[] = 'story-sendmail'; $whiteList[] = 'webapp-ajaxaddview';