From ddb7f3eaddac20ad9afcd7838f0e1b4d1415e349 Mon Sep 17 00:00:00 2001 From: wangchunsheng Date: Mon, 13 Sep 2010 12:05:40 +0000 Subject: [PATCH] * adjust the search feature. --- module/testcase/config.php | 6 +++--- module/testcase/control.php | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/module/testcase/config.php b/module/testcase/config.php index 4aef2dba92..6987f5c481 100644 --- a/module/testcase/config.php +++ b/module/testcase/config.php @@ -4,13 +4,13 @@ $config->testcase->search['module'] = 'testcase'; $config->testcase->search['fields']['title'] = $lang->testcase->title; $config->testcase->search['fields']['id'] = $lang->testcase->id; $config->testcase->search['fields']['keywords'] = $lang->testcase->keywords; +$config->testcase->search['fields']['type'] = $lang->testcase->type; +$config->testcase->search['fields']['openedBy'] = $lang->testcase->openedBy; +$config->testcase->search['fields']['status'] = $lang->testcase->status; $config->testcase->search['fields']['product'] = $lang->testcase->product; $config->testcase->search['fields']['module'] = $lang->testcase->module; -$config->testcase->search['fields']['openedBy'] = $lang->testcase->openedBy; $config->testcase->search['fields']['lastEditedBy'] = $lang->testcase->lastEditedByAB; -$config->testcase->search['fields']['status'] = $lang->testcase->status; $config->testcase->search['fields']['pri'] = $lang->testcase->pri; -$config->testcase->search['fields']['type'] = $lang->testcase->type; $config->testcase->search['fields']['stage'] = $lang->testcase->stage; $config->testcase->search['fields']['openedDate'] = $lang->testcase->openedDate; $config->testcase->search['fields']['lastEditedDate'] = $lang->testcase->lastEditedDateAB; diff --git a/module/testcase/control.php b/module/testcase/control.php index 644254c267..2bc2668f7d 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -100,6 +100,8 @@ class testcase extends control } /* 构造搜索表单。*/ + $this->config->testcase->search['params']['product']['values']= array($productID => $this->products[$productID], 'all' => $this->lang->testcase->allProduct); + $this->config->testcase->search['params']['module']['values'] = $this->loadModel('tree')->getOptionMenu($productID, $viewType = 'case'); $this->config->testcase->search['actionURL'] = $this->createLink('testcase', 'browse', "productID=$productID&browseType=bySearch&queryID=myQueryID"); $this->config->testcase->search['queryID'] = $queryID; $this->view->searchForm = $this->fetch('search', 'buildForm', $this->config->testcase->search);