diff --git a/module/common/control.php b/module/common/control.php index 50d42de18b..3b7d0a2fb2 100644 --- a/module/common/control.php +++ b/module/common/control.php @@ -348,17 +348,6 @@ EOT; return $app->session->product; } - /* 保存最后浏览的项目id到session会话中。*/ - public static function saveProjectState($projectID, $projects) - { - global $app; - if($projectID > 0) $app->session->set('project', (int)$projectID); - if($projectID == 0 and $app->cookie->lastProject) $app->session->set('project', (int)$app->cookie->lastProject); - if($projectID == 0 and $app->session->project == '') $app->session->set('project', $projects[0]); - if(!in_array($app->session->project, $projects)) $app->session->set('project', $projects[0]); - return $app->session->project; - } - /** * Create changes of one object. * diff --git a/module/project/control.php b/module/project/control.php index 4e10b19313..0f23421c74 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -56,7 +56,7 @@ class project extends control $this->loadModel('product'); /* 获取当前项目的详细信息,相关产品,子项目以及团队成员。*/ - $projectID = common::saveProjectState($projectID, array_keys($this->projects)); + $projectID = $this->project->saveState($projectID, array_keys($this->projects)); $project = $this->project->getById($projectID); $products = $this->project->getProducts($project->id); $childProjects = $this->project->getChildProjects($project->id); diff --git a/module/project/model.php b/module/project/model.php index 5356591d86..88b5bc0a2d 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -62,6 +62,23 @@ class projectModel extends model } } + /** + * Save the project id user last visited to session. + * + * @param int $projectID + * @param array $projects + * @access public + * @return int + */ + public function saveState($projectID, $projects) + { + if($projectID > 0) $this->session->set('project', (int)$projectID); + if($projectID == 0 and $this->cookie->lastProject) $this->session->set('project', (int)$this->cookie->lastProject); + if($projectID == 0 and $this->session->project == '') $this->session->set('project', $projects[0]); + if(!in_array($this->session->project, $projects)) $this->session->set('project', $projects[0]); + return $this->session->project; + } + /* 新增项目。*/ public function create() {