From ed064a70726c1d61cb4b78b5dbd6b2f97374bc34 Mon Sep 17 00:00:00 2001
From: "shiyangyangwork@yahoo.cn" <shiyangyang@cnezsoft.com>
Date: Mon, 18 Apr 2011 08:49:27 +0000
Subject: [PATCH] * UpDate it for bug

---
 module/project/control.php |  2 +-
 module/project/model.php   | 26 +++++++++++++++++---------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/module/project/control.php b/module/project/control.php
index 10cfa2b25f..847c7e49b0 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -150,7 +150,7 @@ class project extends control
                 if($this->session->taskQuery == false) $this->session->set('taskQuery', ' 1 = 1');
             }
             $taskQuery = str_replace("`project` = 'all'", '1', $this->session->taskQuery); // Search all project.
-            $tasks     = $this->project->getSearchTasks($projectID, $taskQuery, $pager, $orderBy);
+            $tasks     = $this->project->getSearchTasks($taskQuery, $pager, $orderBy);
         }
 
         if($browseType != 'needconfirm')
diff --git a/module/project/model.php b/module/project/model.php
index 21b133cff7..a8343fac36 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -675,23 +675,31 @@ class projectModel extends model
         foreach($sets as $set) $set->name = substr($set->name, 5);
         return $sets;
     }
-    /*
-     * Get data of search task
-     * @param string        $queryString
+
+    /**
+     * Get taskes by search.
+     * 
+     * @param  string $condition 
+     * @param  object $pager 
+     * @param  string $orderBy 
      * @access public
      * @return array
      */
-    public function getSearchTasks($projectID, $queryString, $pager, $orderBy)
+    public function getSearchTasks($condition, $pager, $orderBy)
     {
-        $taskIdList = $this->dao->select('id')->from(TABLE_TASK)->where($queryString)
-             ->andWhere('deleted')->eq(0)
-             ->orderBy($orderBy)->page($pager)->fetchAll('id');
+        $taskIdList = $this->dao->select('id')
+            ->from(TABLE_TASK)
+            ->where($condition)
+            ->andWhere('deleted')->eq(0)
+            ->orderBy($orderBy)
+            ->page($pager)
+            ->fetchAll('id');
+
         $tasks = $this->dao->select('t1.*, t2.id AS storyID, t2.title AS storyTitle, t2.version AS latestStoryVersion, t2.status AS storyStatus, t3.realname AS assignedToRealName')
              ->from(TABLE_TASK)->alias('t1')
              ->leftJoin(TABLE_STORY)->alias('t2')->on('t1.story = t2.id')
              ->leftJoin(TABLE_USER)->alias('t3')->on('t1.assignedTo = t3.account')
-             ->where('t1.project')->eq((int)$projectID)
-             ->andWhere('t1.deleted')->eq(0)
+             ->where('t1.deleted')->eq(0)
              ->andWhere('t1.id')->in(array_keys($taskIdList))
              ->orderBy($orderBy)
              ->fetchAll();