' id='treebox'>
@@ -83,7 +83,7 @@ function browseBySearch(active)
-
+ recTotal}&recPerPage={$pager->recPerPage}"; ?>
@@ -110,7 +110,7 @@ function browseBySearch(active)
-
+ show();?>
diff --git a/module/product/config.php b/module/product/config.php
index 53dea7774a..c32b0999ef 100644
--- a/module/product/config.php
+++ b/module/product/config.php
@@ -4,7 +4,7 @@ $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']['product'] = $lang->story->product;
+$config->product->search['fields']['spec'] = $lang->story->spec;
$config->product->search['fields']['assignedTo'] = $lang->story->assignedTo;
$config->product->search['fields']['openedBy'] = $lang->story->openedBy;
$config->product->search['fields']['lastEditedBy'] = $lang->story->lastEditedBy;
@@ -12,7 +12,7 @@ $config->product->search['fields']['status'] = $lang->story->status;
$config->product->search['fields']['pri'] = $lang->story->pri;
$config->product->search['params']['title'] = array('operator' => 'include', 'control' => 'input', 'values' => '');
-$config->product->search['params']['product'] = array('operator' => '=', 'control' => 'select', 'values' => 'products');
+$config->product->search['params']['spec'] = array('operator' => 'include', 'control' => 'input', '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');
diff --git a/module/product/control.php b/module/product/control.php
index 6b3cc574f2..a2998b010f 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -87,7 +87,7 @@ class product extends control
elseif($browseType == 'bysearch')
{
if($this->session->storyQuery == false) $this->session->set('storyQuery', ' 1 = 1');
- $stories = $this->story->getByQuery($this->session->storyQuery, $orderBy, $pager);
+ $stories = $this->story->getByQuery($productID, $this->session->storyQuery, $orderBy, $pager);
}
$this->assign('productID', $productID);
diff --git a/module/search/model.php b/module/search/model.php
index 45fcb2f3c2..67a391d372 100644
--- a/module/search/model.php
+++ b/module/search/model.php
@@ -99,7 +99,8 @@ class searchModel extends model
$queryForm[$fieldName] = key($fields);
$queryForm[$andOrName] = 'and';
$queryForm[$operatorName] = $operator;
- $queryForm[$valueName] = '';
+ $queryForm[$valueName] = '';
+
if(!next($fields)) reset($fields);
}
$queryForm['groupAndOr'] = 'and';
@@ -111,12 +112,14 @@ class searchModel extends model
{
$users = $this->loadModel('user')->getPairs();
$products = array('' => '') + $this->loadModel('product')->getPairs();
+ $projects = array('' => '') + $this->loadModel('project')->getPairs();
$fields = array_keys($fields);
foreach($fields as $fieldName)
{
if(!isset($params[$fieldName])) $params[$fieldName] = array('operator' => '=', 'control' => 'input', 'values' => '');
- if($params[$fieldName]['values'] == 'users') $params[$fieldName]['values'] = $users;
- if($params[$fieldName]['values'] == 'products') $params[$fieldName]['values'] = $products;
+ if($params[$fieldName]['values'] == 'users') $params[$fieldName]['values'] = $users;
+ if($params[$fieldName]['values'] == 'products') $params[$fieldName]['values'] = $products;
+ if($params[$fieldName]['values'] == 'projects') $params[$fieldName]['values'] = $projects;
}
return $params;
}
diff --git a/module/story/model.php b/module/story/model.php
index 62b62f4687..726fa61fb6 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -110,9 +110,9 @@ class storyModel extends model
}
/* 按照某一个查询条件获取列表。*/
- public function getByQuery($query, $orderBy, $pager = null)
+ public function getByQuery($productID, $query, $orderBy, $pager = null)
{
- $tmpStories = $this->dao->select('*')->from(TABLE_STORY)->where($query)->orderBy($orderBy)->page($pager)->fetchGroup('plan');
+ $tmpStories = $this->dao->select('*')->from(TABLE_STORY)->where($query)->andWhere('product')->eq((int)$productID)->orderBy($orderBy)->page($pager)->fetchGroup('plan');
if(!$tmpStories) return array();
$plans = $this->dao->select('id,title')->from(TABLE_PRODUCTPLAN)->where('id')->in(array_keys($tmpStories))->fetchPairs();
$stories = array();
diff --git a/module/testcase/config.php b/module/testcase/config.php
index ac6a9a37bc..8a5f6394b6 100644
--- a/module/testcase/config.php
+++ b/module/testcase/config.php
@@ -3,7 +3,7 @@ global $lang;
$config->testcase->search['module'] = 'testcase';
$config->testcase->search['fields']['id'] = $lang->testcase->id;
$config->testcase->search['fields']['title'] = $lang->testcase->title;
-$config->testcase->search['fields']['product'] = $lang->testcase->product;
+$config->testcase->search['fields']['steps'] = $lang->testcase->steps;
$config->testcase->search['fields']['openedBy'] = $lang->testcase->openedBy;
$config->testcase->search['fields']['lastEditedBy'] = $lang->testcase->lastEditedBy;
$config->testcase->search['fields']['status'] = $lang->testcase->status;
@@ -13,7 +13,7 @@ $config->testcase->search['fields']['openedDate'] = $lang->testcase->openedD
$config->testcase->search['fields']['lastEditedDate'] = $lang->testcase->lastEditedDate;
$config->testcase->search['params']['title'] = array('operator' => 'include', 'control' => 'input', 'values' => '');
-$config->testcase->search['params']['product'] = array('operator' => '=', 'control' => 'select', 'values' => 'products');
+$config->testcase->search['params']['steps'] = array('operator' => 'include', 'control' => 'input', 'values' => '');
$config->testcase->search['params']['openedBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users');
$config->testcase->search['params']['lastEditedBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users');
$config->testcase->search['params']['status'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->testcase->statusList);
diff --git a/module/testcase/control.php b/module/testcase/control.php
index b94129939e..e85d9e3a07 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -70,7 +70,7 @@ class testcase extends control
elseif($browseType == 'bysearch')
{
if($this->session->testcaseQuery == false) $this->session->set('testcaseQuery', ' 1 = 1');
- $this->view->cases = $this->dao->select('*')->from(TABLE_CASE)->where($this->session->testcaseQuery)->orderBy($orderBy)->page($pager)->fetchAll();
+ $this->view->cases = $this->dao->select('*')->from(TABLE_CASE)->where($this->session->testcaseQuery)->andWhere('product')->eq($productID)->orderBy($orderBy)->page($pager)->fetchAll();
}
/* 赋值。*/