From a08fae13ecae7e6f739fd5d41f40c260e0296274 Mon Sep 17 00:00:00 2001
From: wangchunsheng <chunsheng@cnezsoft.com>
Date: Tue, 9 Feb 2010 02:29:19 +0000
Subject: [PATCH]  + add the feature of search by plan.

---
 module/product/config.php  | 8 ++++----
 module/product/control.php | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/module/product/config.php b/module/product/config.php
index d034b14051..c449ee7d26 100644
--- a/module/product/config.php
+++ b/module/product/config.php
@@ -4,7 +4,8 @@ $app->loadLang('story');
 $config->product->search['module']                   = 'story';
 $config->product->search['fields']['id']             = $lang->story->id;
 $config->product->search['fields']['title']          = $lang->story->title;
-$config->product->search['fields']['spec']           = $lang->story->spec;
+$config->product->search['fields']['pri']            = $lang->story->pri;
+$config->product->search['fields']['plan']           = $lang->story->plan;
 $config->product->search['fields']['assignedTo']     = $lang->story->assignedTo;
 $config->product->search['fields']['openedBy']       = $lang->story->openedBy;
 $config->product->search['fields']['reviewedBy']     = $lang->story->reviewedBy;
@@ -13,10 +14,10 @@ $config->product->search['fields']['lastEditedBy']   = $lang->story->lastEditedB
 $config->product->search['fields']['status']         = $lang->story->status;
 $config->product->search['fields']['stage']          = $lang->story->stage;
 $config->product->search['fields']['closedReason']   = $lang->story->closedReason;
-$config->product->search['fields']['pri']            = $lang->story->pri;
 
 $config->product->search['params']['title']        = array('operator' => 'include', 'control' => 'input',  'values' => '');
-$config->product->search['params']['spec']         = array('operator' => 'include', 'control' => 'input',  'values' => '');
+$config->product->search['params']['pri']          = array('operator' => '=',       'control' => 'select', 'values' => $lang->story->priList);
+$config->product->search['params']['plan']         = array('operator' => '=',       'control' => 'select', 'values' => '');
 $config->product->search['params']['assignedTo']   = array('operator' => '=',       'control' => 'select', 'values' => 'users');
 $config->product->search['params']['resolvedBy']   = array('operator' => '=',       'control' => 'select', 'values' => 'users');
 $config->product->search['params']['openedBy']     = array('operator' => '=',       'control' => 'select', 'values' => 'users');
@@ -26,5 +27,4 @@ $config->product->search['params']['lastEditedBy'] = array('operator' => '=',
 $config->product->search['params']['status']       = array('operator' => '=',       'control' => 'select', 'values' => $lang->story->statusList);
 $config->product->search['params']['stage']        = array('operator' => '=',       'control' => 'select', 'values' => $lang->story->stageList);
 $config->product->search['params']['closedReason'] = array('operator' => '=',       'control' => 'select', 'values' => $lang->story->reasonList);
-$config->product->search['params']['pri']          = array('operator' => '=',       'control' => 'select', 'values' => $lang->story->priList);
 $config->product->search['params']['mailto']       = array('operator' => 'include', 'control' => 'select', 'values' => 'users');
diff --git a/module/product/control.php b/module/product/control.php
index 1900e8dcd0..60236dffa7 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -53,6 +53,7 @@ class product extends control
     {
         /* 设置搜索条件。*/
         $this->config->product->search['actionURL'] = $this->createLink('product', 'browse', "productID=$productID&browseType=bySearch");
+        $this->config->product->search['params']['plan']['values'] = $this->loadModel('productplan')->getPairs($productID);
         $this->view->searchForm = $this->fetch('search', 'buildForm', $this->config->product->search);
 
         /* 设置查询格式。*/