diff --git a/module/productplan/control.php b/module/productplan/control.php index 1b83126d26..d457f9a8e7 100644 --- a/module/productplan/control.php +++ b/module/productplan/control.php @@ -275,7 +275,7 @@ class productplan extends control $this->loadModel('datatable'); $this->view->modulePairs = $this->loadModel('tree')->getOptionMenu($plan->product, 'story'); - $this->view->title = "PLAN #$plan->id $plan->title/" . $products[$plan->product]; + $this->view->title = "PLAN #$plan->id $plan->title/" . zget($products, $plan->product, ''); $this->view->position[] = $this->lang->productplan->view; $this->view->planStories = $planStories; $this->view->planBugs = $this->loadModel('bug')->getPlanBugs($planID, 'all', $type == 'bug' ? $sort : 'id_desc', $bugPager); diff --git a/module/program/lang/zh-cn.php b/module/program/lang/zh-cn.php index f40aae6775..9861425011 100644 --- a/module/program/lang/zh-cn.php +++ b/module/program/lang/zh-cn.php @@ -220,12 +220,12 @@ $lang->program->PGMShowClosed = '显示已关闭'; $lang->program->PGMTips = '修改父项目集,可关联产品也会发生变化,并且变为必填,如果未选择任何项目集,则系统会默认创建一个和该项目同名的产品并关联到该项目。'; $lang->program->PGMChangeTips = '修改父项目集后,项目已关联的产品会被清空,并且项目下的需求、bug等数据也会受影响,是否修改?'; -$lang->program->PGMAclList['open'] = "公开(有项目集视图权限,即可访问)"; $lang->program->PGMAclList['private'] = "私有(项目集负责人和干系人可访问)"; +$lang->program->PGMAclList['open'] = "公开(有项目集视图权限,即可访问)"; +$lang->program->subPGMAclList['private'] = "私有(本项目集负责人和干系人可访问)"; $lang->program->subPGMAclList['open'] = "全部公开(有项目集视图权限,即可访问)"; $lang->program->subPGMAclList['program'] = "项目集内公开 (所有上级项目集负责人和干系人、本项目集负责人和干系人可访问)"; -$lang->program->subPGMAclList['private'] = "私有(本项目集负责人和干系人可访问)"; $lang->program->PGMAuthList['extend'] = '继承(取项目权限与组织权限的并集)'; $lang->program->PGMAuthList['reset'] = '重新定义(只取项目权限)'; diff --git a/module/program/view/pgmcreate.html.php b/module/program/view/pgmcreate.html.php index 86b56a7d83..286243ba69 100644 --- a/module/program/view/pgmcreate.html.php +++ b/module/program/view/pgmcreate.html.php @@ -102,7 +102,7 @@