From 9853500942d8de88153e7360db7d960c57b28f20 Mon Sep 17 00:00:00 2001
From: xia0ta0 <xia0ta0@outlook.com>
Date: Mon, 29 Jul 2013 16:22:44 +0800
Subject: [PATCH]  * code for task#1587.

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

diff --git a/module/bug/config.php b/module/bug/config.php
index 6e5ac647c1..30d551621e 100644
--- a/module/bug/config.php
+++ b/module/bug/config.php
@@ -61,6 +61,7 @@ $config->bug->search['fields']['status']         = $lang->bug->status;
 $config->bug->search['fields']['confirmed']      = $lang->bug->confirmed;
 
 $config->bug->search['fields']['product']        = $lang->bug->product;
+$config->bug->search['fields']['plan']           = $lang->bug->productplan;
 $config->bug->search['fields']['module']         = $lang->bug->module;
 $config->bug->search['fields']['project']        = $lang->bug->project;
 
@@ -101,6 +102,7 @@ $config->bug->search['params']['status']        = array('operator' => '=',
 $config->bug->search['params']['confirmed']     = array('operator' => '=',       'control' => 'select', 'values' => $lang->bug->confirmedList);
 
 $config->bug->search['params']['product']       = array('operator' => '=',       'control' => 'select', 'values' => '');
+$config->bug->search['params']['plan']          = array('operator' => '=',       'control' => 'select', 'values' => '');
 $config->bug->search['params']['module']        = array('operator' => 'belong',  'control' => 'select', 'values' => 'modules');
 $config->bug->search['params']['project']       = array('operator' => '=',       'control' => 'select', 'values' => 'projects');
 
diff --git a/module/bug/control.php b/module/bug/control.php
index 8a7ab5672b..cb4f6d3c8b 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -118,6 +118,7 @@ class bug extends control
         $this->config->bug->search['actionURL'] = $this->createLink('bug', 'browse', "productID=$productID&browseType=bySearch&queryID=myQueryID");
         $this->config->bug->search['queryID']   = $queryID;
         $this->config->bug->search['params']['product']['values']       = array($productID => $this->products[$productID], 'all' => $this->lang->bug->allProduct);
+        $this->config->bug->search['params']['plan']['values']          = $this->loadModel('productplan')->getPairs($productID);
         $this->config->bug->search['params']['module']['values']        = $this->tree->getOptionMenu($productID, $viewType = 'bug', $startModuleID = 0);
         $this->config->bug->search['params']['project']['values']       = $this->product->getProjectPairs($productID);
         $this->config->bug->search['params']['openedBuild']['values']   = $this->loadModel('build')->getProductBuildPairs($productID);
diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php
index c37a3fbe8a..d561ba36f8 100644
--- a/module/bug/lang/en.php
+++ b/module/bug/lang/en.php
@@ -13,6 +13,7 @@
 $lang->bug->common           = 'Bug';
 $lang->bug->id               = 'ID';
 $lang->bug->product          = 'Product';
+$lang->bug->productplan      = 'Plan';
 $lang->bug->module           = 'Module';
 $lang->bug->path             = 'Path';
 $lang->bug->project          = 'Project';
diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php
index ec1001e77a..455c89ab83 100644
--- a/module/bug/lang/zh-cn.php
+++ b/module/bug/lang/zh-cn.php
@@ -13,6 +13,7 @@
 $lang->bug->common           = 'Bug';
 $lang->bug->id               = 'Bug编号';
 $lang->bug->product          = '所属产品';
+$lang->bug->productplan      = '所属计划';
 $lang->bug->module           = '所属模块';
 $lang->bug->path             = '模块路径';
 $lang->bug->project          = '所属项目';