From 667110a5ca60cd17130e40f75d26f3890e1d9fbd Mon Sep 17 00:00:00 2001
From: wyd621 <wyd621@163.com>
Date: Tue, 20 Aug 2013 11:28:27 +0800
Subject: [PATCH]  * finish task #1400.

---
 module/common/model.php  | 3 ---
 module/story/control.php | 1 +
 module/task/control.php  | 2 ++
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/common/model.php b/module/common/model.php
index e637dc9c92..2ce01a9975 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -683,9 +683,6 @@ class commonModel extends model
             $orderBy = explode('limit', $orderBy[1]);
             $orderBy = str_replace('t1.', '', $orderBy[0]);
 
-            /* Fix bug #448. I don't know why too. */
-            if($orderBy == 'yes') $orderBy = '';
-
             $this->session->set($objectType . 'OrderBy', $orderBy);
         }
         else
diff --git a/module/story/control.php b/module/story/control.php
index d35074d55a..8d6438b5c9 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -1035,6 +1035,7 @@ class story extends control
                 if(isset($storyLang->statusList[$story->status]))       $story->status       = $storyLang->statusList[$story->status];
                 if(isset($storyLang->stageList[$story->stage]))         $story->stage        = $storyLang->stageList[$story->stage];
                 if(isset($storyLang->reasonList[$story->closedReason])) $story->closedReason = $storyLang->reasonList[$story->closedReason];
+                if(isset($storyLang->sourceList[$story->source]))       $story->source       = $storyLang->sourceList[$story->source];
 
                 if(isset($users[$story->openedBy]))     $story->openedBy     = $users[$story->openedBy];
                 if(isset($users[$story->assignedTo]))   $story->assignedTo   = $users[$story->assignedTo];
diff --git a/module/task/control.php b/module/task/control.php
index d5f78a1d42..64d4f9bdfe 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -936,6 +936,7 @@ class task extends control
             /* Get related objects title or names. */
             $relatedStories = $this->dao->select('id,title')->from(TABLE_STORY) ->where('id')->in($relatedStoryIdList)->fetchPairs();
             $relatedFiles   = $this->dao->select('id, objectID, pathname, title')->from(TABLE_FILE)->where('objectType')->eq('task')->andWhere('objectID')->in(@array_keys($tasks))->fetchGroup('objectID');
+            $relatedModules = $this->loadModel('tree')->getTaskOptionMenu($projectID);
 
             foreach($tasks as $task)
             {
@@ -954,6 +955,7 @@ class task extends control
                 if(isset($taskLang->priList[$task->pri]))             $task->pri          = $taskLang->priList[$task->pri];
                 if(isset($taskLang->statusList[$task->status]))       $task->status       = $taskLang->statusList[$task->status];
                 if(isset($taskLang->reasonList[$task->closedReason])) $task->closedReason = $taskLang->reasonList[$task->closedReason];
+                if(isset($relatedModules[$task->module]))             $task->module       = $relatedModules[$task->module];
 
                 if(isset($users[$task->openedBy]))     $task->openedBy     = $users[$task->openedBy];
                 if(isset($users[$task->assignedTo]))   $task->assignedTo   = $users[$task->assignedTo];