diff --git a/db/zentao.sql b/db/zentao.sql index 0c2aedb45f..8b0555d41c 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -2570,7 +2570,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1,'stakeholder','browse'), (1,'stakeholder','communicate'), (1,'stakeholder','create'), -(1,'stakeholder','createExpect'), (1,'stakeholder','delete'), (1,'stakeholder','edit'), (1,'stakeholder','editExpect'), @@ -3743,7 +3742,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (4,'stakeholder','browse'), (4,'stakeholder','communicate'), (4,'stakeholder','create'), -(4,'stakeholder','createExpect'), (4,'stakeholder','delete'), (4,'stakeholder','edit'), (4,'stakeholder','editExpect'), @@ -4256,7 +4254,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (5,'stakeholder','batchCreate'), (5,'stakeholder','communicate'), (5,'stakeholder','create'), -(5,'stakeholder','createExpect'), (5,'stakeholder','delete'), (5,'stakeholder','edit'), (5,'stakeholder','editExpect'), @@ -4666,7 +4663,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (6,'search','select'), (6,'stakeholder','browse'), (6,'stakeholder','communicate'), -(6,'stakeholder','createExpect'), (6,'stakeholder','editExpect'), (6,'stakeholder','expect'), (6,'stakeholder','issue'), @@ -5050,7 +5046,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (7,'stakeholder','browse'), (7,'stakeholder','communicate'), (7,'stakeholder','create'), -(7,'stakeholder','createExpect'), (7,'stakeholder','delete'), (7,'stakeholder','edit'), (7,'stakeholder','editExpect'), @@ -5812,7 +5807,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (9,'stakeholder','browse'), (9,'stakeholder','communicate'), (9,'stakeholder','create'), -(9,'stakeholder','createExpect'), (9,'stakeholder','delete'), (9,'stakeholder','edit'), (9,'stakeholder','editExpect'), diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index a9a8126320..ad01b232b9 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -332,7 +332,6 @@ $lang->resource->stakeholder->view = 'viewAction'; $lang->resource->stakeholder->issue = 'issue'; $lang->resource->stakeholder->communicate = 'communicate'; $lang->resource->stakeholder->expect = 'expect'; -$lang->resource->stakeholder->createExpect = 'createExpect'; $lang->resource->stakeholder->editExpect = 'editExpect'; $lang->resource->stakeholder->viewExpect = 'viewExpect'; $lang->resource->stakeholder->userIssue = 'userIssue'; @@ -346,7 +345,6 @@ $lang->stakeholder->methodOrder[30] = 'view'; $lang->stakeholder->methodOrder[35] = 'issue'; $lang->stakeholder->methodOrder[45] = 'communicate'; $lang->stakeholder->methodOrder[50] = 'expect'; -$lang->stakeholder->methodOrder[65] = 'createExpect'; $lang->stakeholder->methodOrder[70] = 'editExpect'; $lang->stakeholder->methodOrder[75] = 'viewExpect'; $lang->stakeholder->methodOrder[80] = 'userIssue'; diff --git a/module/project/config.php b/module/project/config.php index dbb4c9f0cb..5db6e96a6d 100644 --- a/module/project/config.php +++ b/module/project/config.php @@ -214,4 +214,4 @@ $config->project->includedPriv['repo'] = array('create', 'showSyncCommit', $config->project->includedPriv['testreport'] = array('create', 'view', 'delete', 'edit', 'export'); $config->project->includedPriv['auditplan'] = array('browse', 'create', 'edit', 'batchCreate', 'batchCheck', 'check', 'nc', 'result', 'assignTo'); $config->project->includedPriv['execution'] = array('create', 'start', 'delete', 'calendar', 'effortCalendar', 'effort', 'taskEffort', 'computeTaskEffort', 'deleterelation', 'maintainrelation', 'relation', 'gantt'); -if($config->edition != 'max') $config->project->includedPriv['stakeholder'] = array('browse', 'create', 'batchCreate', 'edit', 'delete', 'view', 'communicate', 'expect', 'createExpect', 'editExpect', 'viewExpect'); +if($config->edition != 'max') $config->project->includedPriv['stakeholder'] = array('browse', 'create', 'batchCreate', 'edit', 'delete', 'view', 'communicate', 'expect', 'editExpect', 'viewExpect'); diff --git a/module/stakeholder/lang/de.php b/module/stakeholder/lang/de.php index 7c8f727bf2..0bfb797cc7 100644 --- a/module/stakeholder/lang/de.php +++ b/module/stakeholder/lang/de.php @@ -17,7 +17,6 @@ $lang->stakeholder->add = 'Create'; $lang->stakeholder->communicate = 'Communications'; $lang->stakeholder->expect = 'Expectation'; $lang->stakeholder->progress = 'Progress'; -$lang->stakeholder->createExpect = 'Add Expectation'; $lang->stakeholder->editExpect = 'Edit Expectation'; $lang->stakeholder->viewExpect = 'Expectation Info'; $lang->stakeholder->issue = 'Issue Management'; diff --git a/module/stakeholder/lang/en.php b/module/stakeholder/lang/en.php index 560d75f47e..2898283277 100644 --- a/module/stakeholder/lang/en.php +++ b/module/stakeholder/lang/en.php @@ -17,7 +17,6 @@ $lang->stakeholder->add = 'Create'; $lang->stakeholder->communicate = 'Communications'; $lang->stakeholder->expect = 'Expectation'; $lang->stakeholder->progress = 'Progress'; -$lang->stakeholder->createExpect = 'Add Expectation'; $lang->stakeholder->editExpect = 'Edit Expectation'; $lang->stakeholder->viewExpect = 'Expectation Info'; $lang->stakeholder->issue = 'Issue Management'; diff --git a/module/stakeholder/lang/fr.php b/module/stakeholder/lang/fr.php index 7c8f727bf2..0bfb797cc7 100644 --- a/module/stakeholder/lang/fr.php +++ b/module/stakeholder/lang/fr.php @@ -17,7 +17,6 @@ $lang->stakeholder->add = 'Create'; $lang->stakeholder->communicate = 'Communications'; $lang->stakeholder->expect = 'Expectation'; $lang->stakeholder->progress = 'Progress'; -$lang->stakeholder->createExpect = 'Add Expectation'; $lang->stakeholder->editExpect = 'Edit Expectation'; $lang->stakeholder->viewExpect = 'Expectation Info'; $lang->stakeholder->issue = 'Issue Management'; diff --git a/module/stakeholder/lang/zh-cn.php b/module/stakeholder/lang/zh-cn.php index 2f4c4c5051..b12866d113 100644 --- a/module/stakeholder/lang/zh-cn.php +++ b/module/stakeholder/lang/zh-cn.php @@ -17,7 +17,6 @@ $lang->stakeholder->add = '新建'; $lang->stakeholder->communicate = '沟通记录'; $lang->stakeholder->expect = '期望内容'; $lang->stakeholder->progress = '达成进展'; -$lang->stakeholder->createExpect = '添加期望'; $lang->stakeholder->editExpect = '编辑期望'; $lang->stakeholder->viewExpect = '期望信息'; $lang->stakeholder->issue = '问题管理';