diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 9d055e6c06..3ea287aaf4 100755 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -124,7 +124,7 @@ $lang->mainNav = new stdclass(); $lang->mainNav->my = ' 地盘|my|index|'; $lang->mainNav->program = ' 项目集|program|pgmindex|'; $lang->mainNav->product = ' 产品|product|productlist|'; -$lang->mainNav->project = ' 项目|project|projectlist|'; +$lang->mainNav->project = ' 项目|program|prjbrowse|'; $lang->mainNav->system = ' 组织|custom|estimate|'; $lang->mainNav->admin = ' 后台|admin|index|'; diff --git a/module/program/control.php b/module/program/control.php index d6f4abaa3c..50ea08f05a 100644 --- a/module/program/control.php +++ b/module/program/control.php @@ -731,6 +731,7 @@ class program extends control */ public function ajaxGetEnterLink($programID = 0) { + $this->lang->navGroup->program = 'project'; $program = $this->project->getByID($programID); $programProjects = $this->project->getPairs('', $this->session->PRJ); $programProject = key($programProjects); @@ -746,4 +747,33 @@ class program extends control die($link); } + + /** + * Projects list. + * + * @param int $programID + * @param string $browseType + * @param int $param + * @param string $orderBy + * @param int $recTotal + * @param int $recPerPage + * @param int $pageID + * @access public + * @return void + */ + public function PRJBrowse($programID = 0, $browseType = 'all', $param = 0, $orderBy = 'order_desc', $recTotal = 0, $recPerPage = 15, $pageID = 1) + { + $this->lang->navGroup->program = 'project'; + /* Load pager and get tasks. */ + $this->app->loadClass('pager', $static = true); + $pager = new pager($recTotal, $recPerPage, $pageID); + + $this->view->projectStats = array(); + $this->view->pager = $pager; + $this->view->programID = $programID; + $this->view->browseType = $browseType; + $this->view->orderBy = $orderBy; + $this->view->stack = ''; + $this->display(); + } } diff --git a/module/project/view/projectlist.html.php b/module/program/view/prjbrowse.html.php similarity index 100% rename from module/project/view/projectlist.html.php rename to module/program/view/prjbrowse.html.php diff --git a/module/project/control.php b/module/project/control.php index 888aeca82a..1c6dee5a4b 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -29,34 +29,6 @@ class project extends control } } - /** - * Projects under project set. - * - * @param int $programID - * @param string $browseType - * @param int $param - * @param string $orderBy - * @param int $recTotal - * @param int $recPerPage - * @param int $pageID - * @access public - * @return void - */ - public function projectList($programID = 0, $browseType = 'all', $param = 0, $orderBy = 'order_desc', $recTotal = 0, $recPerPage = 15, $pageID = 1) - { - /* Load pager and get tasks. */ - $this->app->loadClass('pager', $static = true); - $pager = new pager($recTotal, $recPerPage, $pageID); - - $this->view->projectStats = array(); - $this->view->pager = $pager; - $this->view->programID = $programID; - $this->view->browseType = $browseType; - $this->view->orderBy = $orderBy; - $this->view->stack = ''; - $this->display(); - } - /** * The index page. *