From bc17d2b5e63b070b30e497667c46dfb80d9322c2 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Thu, 22 Nov 2012 01:43:24 +0000
Subject: [PATCH]  * finish task #945.

---
 module/project/control.php | 6 +++---
 www/js/my.full.js          | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/project/control.php b/module/project/control.php
index 60b067000e..7d77eed0d6 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -66,7 +66,7 @@ class project extends control
      * @access public
      * @return object current object
      */
-    public function commonAction($projectID = 0)
+    public function commonAction($projectID = 0, $extra = '')
     {
         $this->loadModel('product');
 
@@ -78,7 +78,7 @@ class project extends control
         $teamMembers   = $this->project->getTeamMembers($project->id);
 
         /* Set menu. */
-        $this->project->setMenu($this->projects, $project->id);
+        $this->project->setMenu($this->projects, $project->id, $extra);
 
         /* Assign. */
         $this->view->projects      = $this->projects;
@@ -110,7 +110,7 @@ class project extends control
         $browseType = strtolower($status);
         $queryID    = ($browseType == 'bysearch') ? (int)$param : 0;
         $moduleID   = ($status == 'byModule') ? (int)$param : 0;
-        $project    = $this->commonAction($projectID);
+        $project    = $this->commonAction($projectID, $status);
         $projectID  = $project->id;
      
         /* Save to session. */
diff --git a/www/js/my.full.js b/www/js/my.full.js
index bc22d6a087..068e94377c 100644
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -275,7 +275,7 @@ function switchProject(projectID, module, method, extra)
     if(module == 'project' && method == 'create') die;
 
     link = createLink(module, method, 'projectID=' + projectID);
-    if(module == 'tree') link = createLink(module, method, 'projectID=' + projectID + '&type=' + extra);
+    if(extra != '') link = createLink(module, method, 'projectID=' + projectID + '&type=' + extra);
     location.href = link;
 }