From e555484f3dce220b8d74827bb5168e1b812d72fc Mon Sep 17 00:00:00 2001
From: wangchunsheng <chunsheng@cnezsoft.com>
Date: Fri, 26 Feb 2010 02:43:31 +0000
Subject: [PATCH]  * when search, can search all product.

---
 module/bug/config.php     | 2 ++
 module/bug/control.php    | 4 +++-
 module/bug/lang/zh-cn.php | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/module/bug/config.php b/module/bug/config.php
index 9f935c6779..78e2ad80b6 100644
--- a/module/bug/config.php
+++ b/module/bug/config.php
@@ -7,6 +7,7 @@ $config->bug->search['fields']['steps']          = $lang->bug->steps;
 $config->bug->search['fields']['assignedTo']     = $lang->bug->assignedTo;
 $config->bug->search['fields']['resolvedBy']     = $lang->bug->resolvedBy;
 $config->bug->search['fields']['openedBy']       = $lang->bug->openedBy;
+$config->bug->search['fields']['product']        = $lang->bug->product;
 $config->bug->search['fields']['module']         = $lang->bug->module;
 $config->bug->search['fields']['project']        = $lang->bug->project;
 $config->bug->search['fields']['closedBy']       = $lang->bug->closedBy;
@@ -27,6 +28,7 @@ $config->bug->search['fields']['lastEditedDate'] = $lang->bug->lastEditedDate;
 
 $config->bug->search['params']['title']        = array('operator' => 'include', 'control' => 'input',  'values' => '');
 $config->bug->search['params']['steps']        = array('operator' => 'include', 'control' => 'input',  'values' => '');
+$config->bug->search['params']['product']      = array('operator' => '=',       'control' => 'select', 'values' => '');
 $config->bug->search['params']['module']       = array('operator' => '=',       'control' => 'select', 'values' => 'modules');
 $config->bug->search['params']['project']      = array('operator' => '=',       'control' => 'select', 'values' => 'projects');
 $config->bug->search['params']['assignedTo']   = array('operator' => '=',       'control' => 'select', 'values' => 'users');
diff --git a/module/bug/control.php b/module/bug/control.php
index 89502839db..e7b23656a7 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -56,6 +56,7 @@ class bug extends control
 
         /* 设置搜索表单。*/
         $this->config->bug->search['actionURL'] = $this->createLink('bug', 'browse', "productID=$productID&browseType=bySearch");
+        $this->config->bug->search['params']['product']['values']       = array($productID => $this->products[$productID], 'all' => $this->lang->bug->allProduct);
         $this->config->bug->search['params']['module']['values']        = $this->tree->getOptionMenu($productID, $viewType = 'bug', $rooteModuleID = 0);
         $this->config->bug->search['params']['project']['values']       = $this->product->getProjectPairs($productID);
         $this->config->bug->search['params']['openedBuild']['values']   = $this->loadModel('build')->getProductBuildPairs($productID);
@@ -107,7 +108,8 @@ class bug extends control
         elseif($browseType == 'bysearch')
         {
             if($this->session->bugQuery == false) $this->session->set('bugQuery', ' 1 = 1');
-            $bugs = $this->dao->select('*')->from(TABLE_BUG)->where($this->session->bugQuery)->andWhere('product')->eq($productID)->orderBy($orderBy)->page($pager)->fetchAll();
+            $bugQuery = str_replace("`product` = 'all'", '1', $this->session->bugQuery); // 如果指定了搜索所有的产品，去掉这个查询条件。
+            $bugs = $this->dao->select('*')->from(TABLE_BUG)->where($bugQuery)->orderBy($orderBy)->page($pager)->fetchAll();
         }
 
         $users = $this->user->getPairs('noletter');
diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php
index 0c7517f40f..650c155bb9 100644
--- a/module/bug/lang/zh-cn.php
+++ b/module/bug/lang/zh-cn.php
@@ -43,6 +43,7 @@ $lang->bug->postponedBugs  = '被延期';
 $lang->bug->allBugs        = '所有Bug';
 $lang->bug->moduleBugs     = '按模块浏览';
 $lang->bug->byQuery        = '搜索';
+$lang->bug->allProduct     = '所有产品';
 
 $lang->bug->lblProductAndModule         = '产品模块';
 $lang->bug->lblProjectAndTask           = '项目任务';