diff --git a/module/common/model.php b/module/common/model.php index 53d4b945b8..7dc5b031dd 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -241,8 +241,8 @@ class commonModel extends model $task = $this->lang->my->menu->task; $story = $this->lang->my->menu->story; $bug = $this->lang->my->menu->bug; - $project = $this->lang->menu->project . '|locate=no&&status=doing&projectID=1'; - $product = $this->lang->menu->product . '|locate=no&productID=1'; + $project = $this->lang->menu->project . '|locate=no&&status=doing'; + $product = $this->lang->menu->product . '|locate=no'; if($role == 'dev' or $role == 'td' or $role == 'pm') { diff --git a/module/project/control.php b/module/project/control.php index 3d334d9f52..23de43052b 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -41,7 +41,7 @@ class project extends control { if($locate == 'yes') $this->locate($this->createLink('project', 'task')); - $this->commonAction($projectID); + if($this->projects) $this->commonAction($projectID); $this->session->set('projectList', $this->app->getURI(true)); $this->app->loadLang('my');