diff --git a/db/zentao.sql b/db/zentao.sql index b64c76b433..23cd0212c6 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -2584,13 +2584,11 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1,'stakeholder','edit'), (1,'stakeholder','editExpect'), (1,'stakeholder','expect'), -(1,'stakeholder','expectation'), (1,'stakeholder','issue'), (1,'stakeholder','plan'), (1,'stakeholder','userIssue'), (1,'stakeholder','view'), (1,'stakeholder','viewExpect'), -(1,'stakeholder','viewIssue'), (1,'story','activate'), (1,'story','assignTo'), (1,'story','batchAssignTo'), @@ -3785,13 +3783,11 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (4,'stakeholder','edit'), (4,'stakeholder','editExpect'), (4,'stakeholder','expect'), -(4,'stakeholder','expectation'), (4,'stakeholder','issue'), (4,'stakeholder','plan'), (4,'stakeholder','userIssue'), (4,'stakeholder','view'), (4,'stakeholder','viewExpect'), -(4,'stakeholder','viewIssue'), (4,'story','activate'), (4,'story','assignTo'), (4,'story','batchAssignTo'), @@ -4309,13 +4305,11 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (5,'stakeholder','edit'), (5,'stakeholder','editExpect'), (5,'stakeholder','expect'), -(5,'stakeholder','expectation'), (5,'stakeholder','issue'), (5,'stakeholder','plan'), (5,'stakeholder','userIssue'), (5,'stakeholder','view'), (5,'stakeholder','viewExpect'), -(5,'stakeholder','viewIssue'), (5,'story','activate'), (5,'story','assignTo'), (5,'story','batchAssignTo'), @@ -4727,12 +4721,10 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (6,'stakeholder','deleteExpect'), (6,'stakeholder','editExpect'), (6,'stakeholder','expect'), -(6,'stakeholder','expectation'), (6,'stakeholder','issue'), (6,'stakeholder','userIssue'), (6,'stakeholder','view'), (6,'stakeholder','viewExpect'), -(6,'stakeholder','viewIssue'), (6,'story','batchToTask'), (6,'story','bugs'), (6,'story','cases'), @@ -5122,12 +5114,10 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (7,'stakeholder','edit'), (7,'stakeholder','editExpect'), (7,'stakeholder','expect'), -(7,'stakeholder','expectation'), (7,'stakeholder','issue'), (7,'stakeholder','userIssue'), (7,'stakeholder','view'), (7,'stakeholder','viewExpect'), -(7,'stakeholder','viewIssue'), (7,'story','activate'), (7,'story','assignTo'), (7,'story','batchAssignTo'), @@ -5903,13 +5893,11 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (9,'stakeholder','edit'), (9,'stakeholder','editExpect'), (9,'stakeholder','expect'), -(9,'stakeholder','expectation'), (9,'stakeholder','issue'), (9,'stakeholder','plan'), (9,'stakeholder','userIssue'), (9,'stakeholder','view'), (9,'stakeholder','viewExpect'), -(9,'stakeholder','viewIssue'), (9,'story','bugs'), (9,'story','cases'), (9,'story','export'), @@ -6170,7 +6158,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (10,'stakeholder','browse'), (10,'stakeholder','userIssue'), (10,'stakeholder','view'), -(10,'stakeholder','viewIssue'), (10,'story','bugs'), (10,'story','cases'), (10,'story','export'), @@ -6424,12 +6411,10 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (11,'stakeholder','browse'), (11,'stakeholder','communicate'), (11,'stakeholder','expect'), -(11,'stakeholder','expectation'), (11,'stakeholder','issue'), (11,'stakeholder','userIssue'), (11,'stakeholder','view'), (11,'stakeholder','viewExpect'), -(11,'stakeholder','viewIssue'), (11,'story','bugs'), (11,'story','cases'), (11,'story','export'), diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index c2ebab27d7..bc92d65872 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -334,7 +334,6 @@ $lang->resource->stakeholder->view = 'viewAction'; $lang->resource->stakeholder->issue = 'issue'; $lang->resource->stakeholder->communicate = 'communicate'; $lang->resource->stakeholder->expect = 'expect'; -$lang->resource->stakeholder->expectation = 'expectation'; $lang->resource->stakeholder->deleteExpect = 'deleteExpect'; $lang->resource->stakeholder->createExpect = 'createExpect'; $lang->resource->stakeholder->editExpect = 'editExpect'; @@ -350,7 +349,6 @@ $lang->stakeholder->methodOrder[30] = 'view'; $lang->stakeholder->methodOrder[35] = 'issue'; $lang->stakeholder->methodOrder[45] = 'communicate'; $lang->stakeholder->methodOrder[50] = 'expect'; -$lang->stakeholder->methodOrder[55] = 'expectation'; $lang->stakeholder->methodOrder[60] = 'deleteExpect'; $lang->stakeholder->methodOrder[65] = 'createExpect'; $lang->stakeholder->methodOrder[70] = 'editExpect'; diff --git a/module/project/config.php b/module/project/config.php index 475dbe4d52..7712dba71c 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', 'expectation', 'deleteExpect', 'createExpect', 'editExpect', 'viewExpect'); +if($config->edition != 'max') $config->project->includedPriv['stakeholder'] = array('browse', 'create', 'batchCreate', 'edit', 'delete', 'view', 'communicate', 'expect', 'deleteExpect', 'createExpect', 'editExpect', 'viewExpect'); diff --git a/module/stakeholder/lang/de.php b/module/stakeholder/lang/de.php index f6bf36bfc4..83f9b5dd64 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->expectation = 'Manage Expectation'; $lang->stakeholder->createExpect = 'Add Expectation'; $lang->stakeholder->deleteExpect = 'Delete Expectation'; $lang->stakeholder->editExpect = 'Edit Expectation'; diff --git a/module/stakeholder/lang/en.php b/module/stakeholder/lang/en.php index 348886985f..82dae78ea0 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->expectation = 'Manage Expectation'; $lang->stakeholder->createExpect = 'Add Expectation'; $lang->stakeholder->deleteExpect = 'Delete Expectation'; $lang->stakeholder->editExpect = 'Edit Expectation'; diff --git a/module/stakeholder/lang/fr.php b/module/stakeholder/lang/fr.php index f6bf36bfc4..83f9b5dd64 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->expectation = 'Manage Expectation'; $lang->stakeholder->createExpect = 'Add Expectation'; $lang->stakeholder->deleteExpect = 'Delete Expectation'; $lang->stakeholder->editExpect = 'Edit Expectation'; diff --git a/module/stakeholder/lang/zh-cn.php b/module/stakeholder/lang/zh-cn.php index b474241cd5..20a71f8f3d 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->expectation = '期望管理'; $lang->stakeholder->createExpect = '添加期望'; $lang->stakeholder->deleteExpect = '删除期望'; $lang->stakeholder->editExpect = '编辑期望';