From 637e0e09e5fdc59ee85bdfa2cdc13144b402b0f5 Mon Sep 17 00:00:00 2001
From: wangchunsheng <chunsheng@cnezsoft.com>
Date: Fri, 26 Mar 2010 12:32:18 +0000
Subject: [PATCH]  * adjust the page location feature.

---
 module/bug/view/view.html.php         | 2 +-
 module/productplan/control.php        | 1 +
 module/productplan/view/view.html.php | 8 ++++++--
 module/task/view/view.html.php        | 5 +++--
 module/user/control.php               | 4 ++++
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php
index 8d4f94e1e4..4553d18b74 100644
--- a/module/bug/view/view.html.php
+++ b/module/bug/view/view.html.php
@@ -59,7 +59,7 @@
       if(!($bug->status == 'active'   and common::printLink('bug', 'resolve', $params, $lang->bug->buttonResolve)))   echo $lang->bug->buttonResolve . ' ';
       if(!($bug->status == 'resolved' and common::printLink('bug', 'close', $params, $lang->bug->buttonClose)))       echo $lang->bug->buttonClose . ' ';
       if(!(($bug->status == 'closed' or $bug->status == 'resolved') and common::printLink('bug', 'activate', $params, $lang->bug->buttonActivate))) echo $lang->bug->buttonActivate . ' ';
-      common::printLink('bug', 'browse', '', $lang->bug->buttonToList);
+      echo html::a($browseLink, $lang->goback);
       ?>
       </div>
     </div>
diff --git a/module/productplan/control.php b/module/productplan/control.php
index 8ab8e1383f..82cf05c3c2 100644
--- a/module/productplan/control.php
+++ b/module/productplan/control.php
@@ -95,6 +95,7 @@ class productplan extends control
     /* 计划详情。*/
     public function view($planID = 0)
     {
+        $this->session->set('storyList', $this->app->getURI(true));
         $plan = $this->productplan->getByID($planID);
         $this->commonAction($plan->product);
         $this->view->header->title = $this->lang->productplan->view;
diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php
index e7e8c3a5ea..b7af6a5a05 100644
--- a/module/productplan/view/view.html.php
+++ b/module/productplan/view/view.html.php
@@ -56,16 +56,20 @@
       <th class='w-p5'><?php echo $lang->story->pri;?></th>
       <th class='w-p10'><?php echo $lang->story->product;?></th>
       <th><?php echo $lang->story->title;?></th>
+      <th><?php echo $lang->story->status;?></th>
+      <th><?php echo $lang->story->stage;?></th>
       <th class='w-p10'><?php echo $lang->actions?></th>
     </tr>
     </thead>
     <tbody>
     <?php foreach($planStories as $story):?>
     <tr>
-      <td><?php echo $story->id;?></td>
+      <td><?php echo html::a($this->createLink('story', 'view', "storyID=$story->id"), $story->id);?></td>
       <td><?php echo $story->pri;?></td>
       <td><?php echo html::a($this->createLink('product', 'browse', "productID=$story->product"), $products[$story->product], '_blank');?></td>
-      <td class='a-left nobr'><?php echo $story->title;?></td>
+      <td class='a-left nobr'><?php echo html::a($this->createLink('story', 'view', "storyID=$story->id"), $story->title);?></td>
+      <td><?php echo $lang->story->statusList[$story->status];?></td>
+      <td><?php echo $lang->story->stageList[$story->stage];?></td>
       <td><?php common::printLink('productplan', 'unlinkStory', "story=$story->id", $lang->productplan->unlinkStory, 'hiddenwin');?></td>
     </tr>
     <?php endforeach;?>
diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php
index 8d4c8b1f8c..51271afe7e 100644
--- a/module/task/view/view.html.php
+++ b/module/task/view/view.html.php
@@ -29,13 +29,14 @@
     <div id='main'>TASK #<?php echo $task->id . $lang->colon . $task->name;?></div>
     <div>
     <?php
+    $browseLink = $app->session->taskList != false ? $app->session->taskList : $this->createLink('project', 'browse', "projectID=$task->project");
     //if(!($task->status != 'closed' and $task->status != 'cancel' and common::printLink('task', 'logEfforts', "taskID=$task->id", $lang->task->buttonLogEfforts))) echo $lang->task->buttonLogEfforts . ' ';
     //if(!($task->status != 'closed' and $task->status != 'cancel' and common::printLink('task', 'close',      "taskID=$task->id", $lang->task->buttonClose)))      echo $lang->task->buttonClose . ' ';
     //if(!($task->status != 'closed' and $task->status != 'cancel' and common::printLink('task', 'cancel',     "taskID=$task->id", $lang->task->buttonCancel)))     echo $lang->task->buttonCancel . ' ';
     //if(!($task->status == 'closed' or $task->status == 'cancel'  and common::printLink('task', 'activate',   "taskID=$task->id", $lang->task->buttonActivate)))   echo $lang->task->buttonActivate . ' ';
     if(!common::printLink('task', 'edit',  "taskID=$task->id", $lang->task->buttonEdit)) echo $lang->task->buttonEdit . ' ';
     if(!common::printLink('task', 'delete',"projectID=$task->project&taskID=$task->id", $lang->task->buttonDelete, 'hiddenwin')) echo $lang->task->buttonDelete . ' ';
-    echo html::a($app->session->taskList,  $lang->task->buttonBackToList);
+    echo html::a($browseLink,  $lang->goback);
     ?>
     </div>
   </div>
@@ -61,7 +62,7 @@
         //if(!($task->status == 'closed' or $task->status == 'cancel'  and common::printLink('task', 'activate',   "taskID=$task->id", $lang->task->buttonActivate)))   echo $lang->task->buttonActivate . ' ';
         if(!common::printLink('task', 'edit', "taskID=$task->id", $lang->task->buttonEdit)) echo $lang->task->buttonEdit . ' ';
         if(!common::printLink('task', 'delete',"projectID=$task->project&taskID=$task->id", $lang->task->buttonDelete, 'hiddenwin')) echo $lang->task->buttonDelete . ' ';
-        echo html::a($app->session->taskList,  $lang->task->buttonBackToList);
+        echo html::a($browseLink,  $lang->goback);
         ?>
       </div>
     </div>
diff --git a/module/user/control.php b/module/user/control.php
index c8e5c0ac77..a88b066634 100644
--- a/module/user/control.php
+++ b/module/user/control.php
@@ -73,6 +73,8 @@ class user extends control
     /* Óû§µÄtaskÁÐ±í¡£*/
     public function task($account)
     {
+        $this->session->set('taskList', $this->app->getURI(true));
+
         /* ¼ÓÔØtask model¡£*/
         $this->loadModel('task');
         $this->lang->set('menugroup.user', 'company');
@@ -98,6 +100,8 @@ class user extends control
     /* Óû§µÄbugÁÐ±í¡£*/
     public function bug($account)
     {
+        $this->session->set('bugList', $this->app->getURI(true));
+
         /* ¼ÓÔØbug model¡£*/
         $this->loadModel('bug');
         $this->lang->set('menugroup.user', 'company');