diff --git a/module/group/lang/de.php b/module/group/lang/de.php index 55ab7e7a08..9873a7d28d 100644 --- a/module/group/lang/de.php +++ b/module/group/lang/de.php @@ -404,8 +404,9 @@ $lang->group->package->manageReview = 'Manage Review'; $lang->group->package->manageIssue = 'Manage Issue'; $lang->group->package->projectSetting = 'Project Setting'; $lang->group->package->browseProjectRelease = 'Browse Project Release'; -$lang->group->package->projectWeekly = 'Project Weekly'; -$lang->group->package->projectMilestone = 'Project Milestone'; +$lang->group->package->browseProjectReport = 'Browse Report'; +$lang->group->package->manageProjectReport = 'Create and Manage Report'; +$lang->group->package->projectMilestone = 'Milestone Report'; $lang->group->package->researchPlan = 'Research Plan'; $lang->group->package->researchReport = 'Research Report'; $lang->group->package->budget = 'Budget'; diff --git a/module/group/lang/en.php b/module/group/lang/en.php index 71e0a47a35..a7b1c115ca 100644 --- a/module/group/lang/en.php +++ b/module/group/lang/en.php @@ -404,8 +404,9 @@ $lang->group->package->manageReview = 'Manage Review'; $lang->group->package->manageIssue = 'Manage Issue'; $lang->group->package->projectSetting = 'Project Setting'; $lang->group->package->browseProjectRelease = 'Browse Project Release'; -$lang->group->package->projectWeekly = 'Project Weekly'; -$lang->group->package->projectMilestone = 'Project Milestone'; +$lang->group->package->browseProjectReport = 'Browse Report'; +$lang->group->package->manageProjectReport = 'Create and Manage Report'; +$lang->group->package->projectMilestone = 'Milestone Report'; $lang->group->package->researchPlan = 'Research Plan'; $lang->group->package->researchReport = 'Research Report'; $lang->group->package->budget = 'Budget'; diff --git a/module/group/lang/fr.php b/module/group/lang/fr.php index d8f3aebfb7..f58ad676bf 100644 --- a/module/group/lang/fr.php +++ b/module/group/lang/fr.php @@ -404,8 +404,9 @@ $lang->group->package->manageReview = 'Manage Review'; $lang->group->package->manageIssue = 'Manage Issue'; $lang->group->package->projectSetting = 'Project Setting'; $lang->group->package->browseProjectRelease = 'Browse Project Release'; -$lang->group->package->projectWeekly = 'Project Weekly'; -$lang->group->package->projectMilestone = 'Project Milestone'; +$lang->group->package->browseProjectReport = 'Browse Report'; +$lang->group->package->manageProjectReport = 'Create and Manage Report'; +$lang->group->package->projectMilestone = 'Milestone Report'; $lang->group->package->researchPlan = 'Research Plan'; $lang->group->package->researchReport = 'Research Report'; $lang->group->package->budget = 'Budget'; diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php index d7ee0c5b58..9e0e5acfa8 100644 --- a/module/group/lang/zh-cn.php +++ b/module/group/lang/zh-cn.php @@ -404,8 +404,9 @@ $lang->group->package->manageReview = '维护基线评审'; $lang->group->package->manageIssue = '维护问题'; $lang->group->package->projectSetting = '项目配置'; $lang->group->package->browseProjectRelease = '浏览项目发布'; -$lang->group->package->projectWeekly = '项目周报'; -$lang->group->package->projectMilestone = '项目里程碑报告'; +$lang->group->package->browseProjectReport = '浏览报告'; +$lang->group->package->manageProjectReport = '创建与维护报告'; +$lang->group->package->projectMilestone = '里程碑报告'; $lang->group->package->researchPlan = '调研计划'; $lang->group->package->researchReport = '调研报告'; $lang->group->package->budget = '费用估算'; diff --git a/module/group/packagemanager.php b/module/group/packagemanager.php index 800b5b6f2b..1db51158b1 100644 --- a/module/group/packagemanager.php +++ b/module/group/packagemanager.php @@ -2235,15 +2235,22 @@ $config->group->package->browseProjectRelease->privs = array(); $config->group->package->browseProjectRelease->privs['projectrelease-browse'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 0, 'depend' => array('project-index'), 'recommend' => array('projectrelease-create', 'projectrelease-edit', 'projectrelease-view')); $config->group->package->browseProjectRelease->privs['projectrelease-view'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 1, 'depend' => array('projectrelease-browse'), 'recommend' => array('projectrelease-create', 'projectrelease-edit')); -$config->group->package->projectWeekly = new stdclass(); -$config->group->package->projectWeekly->order = 5; -$config->group->package->projectWeekly->subset = 'projectreport'; -$config->group->package->projectWeekly->privs = array(); -$config->group->package->projectWeekly->privs['weekly-index'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 5, 'depend' => array('project-index'), 'recommend' => array()); -$config->group->package->projectWeekly->privs['weekly-exportweeklyreport'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 10, 'depend' => array('weekly-index'), 'recommend' => array('weekly-index')); +$config->group->package->browseProjectReport = new stdclass(); +$config->group->package->browseProjectReport->order = 5; +$config->group->package->browseProjectReport->subset = 'projectreport'; +$config->group->package->browseProjectReport->privs = array(); +$config->group->package->browseProjectReport->privs['weekly-browse'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 5, 'depend' => array(), 'recommend' => array('weekly-view')); +$config->group->package->browseProjectReport->privs['weekly-view'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 10, 'depend' => array('weekly-browse'), 'recommend' => array()); + +$config->group->package->manageProjectReport = new stdclass(); +$config->group->package->manageProjectReport->order = 10; +$config->group->package->manageProjectReport->subset = 'projectreport'; +$config->group->package->manageProjectReport->privs = array(); +$config->group->package->manageProjectReport->privs['weekly-create'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 5, 'depend' => array('weekly-browse', 'weekly-view'), 'recommend' => array('weekly-edit')); +$config->group->package->manageProjectReport->privs['weekly-edit'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 10, 'depend' => array('weekly-browse', 'weekly-view'), 'recommend' => array('weekly-create')); $config->group->package->projectMilestone = new stdclass(); -$config->group->package->projectMilestone->order = 10; +$config->group->package->projectMilestone->order = 15; $config->group->package->projectMilestone->subset = 'projectreport'; $config->group->package->projectMilestone->privs = array(); $config->group->package->projectMilestone->privs['milestone-index'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 5, 'depend' => array('project-index', 'weekly-index'), 'recommend' => array('milestone-saveOtherProblem'));