diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 9cb3ddf7a5..1b168a08c5 100755 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -581,6 +581,7 @@ $lang->navGroup->productplan = 'product'; $lang->navGroup->release = 'product'; $lang->navGroup->branch = 'product'; +$lang->navGroup->project = 'project'; $lang->navGroup->story = 'project'; $lang->navGroup->tree = 'project'; $lang->navGroup->task = 'project'; diff --git a/module/common/model.php b/module/common/model.php index 4b84ba0a39..1ec612c979 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -1638,8 +1638,8 @@ EOD; { $this->app->user = $this->session->user; - $inProgram = isset($this->lang->navGroup->$module) && $this->lang->navGroup->$module == 'project'; - if(!defined('IN_UPGRADE') and $inProgram) + $inProject = (isset($this->lang->navGroup->$module) && $this->lang->navGroup->$module == 'project') || ($module == 'program' && $method == 'index'); + if(!defined('IN_UPGRADE') and $inProject) { /* Check program priv. */ if(strpos(",{$this->app->user->view->projects},", ",{$this->session->PRJ},") === false and !$this->app->user->admin) $this->loadModel('program')->accessDenied(); diff --git a/module/program/css/prjedit.css b/module/program/css/prjedit.css new file mode 100644 index 0000000000..e7c1b33177 --- /dev/null +++ b/module/program/css/prjedit.css @@ -0,0 +1 @@ +#budget {border-right:0px;} diff --git a/module/program/model.php b/module/program/model.php index 6ae4d06859..60e76d484b 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -1331,7 +1331,7 @@ class programModel extends model echo $project->code; break; case 'PRJName': - echo html::a(helper::createLink('program', 'index', "projectID=$project->id"), $project->name); + echo html::a(helper::createLink('program', 'index', "projectID=$project->id", '', '', $project->id), $project->name); break; case 'PRJModel': echo zget($this->lang->program->modelList, $project->model); diff --git a/module/program/view/ajaxgetpgmdropmenu.html.php b/module/program/view/ajaxgetpgmdropmenu.html.php index 335c521395..3b56f790f5 100644 --- a/module/program/view/ajaxgetpgmdropmenu.html.php +++ b/module/program/view/ajaxgetpgmdropmenu.html.php @@ -14,7 +14,7 @@ $programsPinYin = common::convert2Pinyin($programNames);