diff --git a/module/bug/config.php b/module/bug/config.php index 12027aa3d1..9f935c6779 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']['module'] = $lang->bug->module; $config->bug->search['fields']['project'] = $lang->bug->project; $config->bug->search['fields']['closedBy'] = $lang->bug->closedBy; $config->bug->search['fields']['lastEditedBy'] = $lang->bug->lastEditedBy; @@ -18,12 +19,15 @@ $config->bug->search['fields']['browser'] = $lang->bug->browser; $config->bug->search['fields']['resolution'] = $lang->bug->resolution; $config->bug->search['fields']['mailto'] = $lang->bug->mailto; $config->bug->search['fields']['openedDate'] = $lang->bug->openedDate; +$config->bug->search['fields']['openedBuild'] = $lang->bug->openedBuild; +$config->bug->search['fields']['resolvedBuild'] = $lang->bug->resolvedBuild; $config->bug->search['fields']['assignedDate'] = $lang->bug->assignedDate; $config->bug->search['fields']['closedDate'] = $lang->bug->closedDate; $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']['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'); $config->bug->search['params']['resolvedBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); @@ -37,3 +41,5 @@ $config->bug->search['params']['os'] = array('operator' => '=', $config->bug->search['params']['browser'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->bug->browserList); $config->bug->search['params']['resolution'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->bug->resolutionList); $config->bug->search['params']['mailto'] = array('operator' => 'include', 'control' => 'select', 'values' => 'users'); +$config->bug->search['params']['openedBuild'] = array('operator' => '=', 'control' => 'select', 'values' => 'builds'); +$config->bug->search['params']['resolvedBuild']= array('operator' => '=', 'control' => 'select', 'values' => 'builds'); diff --git a/module/bug/control.php b/module/bug/control.php index 386d617b99..4d8bcad84f 100644 --- a/module/bug/control.php +++ b/module/bug/control.php @@ -56,6 +56,10 @@ class bug extends control /* 设置搜索表单。*/ $this->config->bug->search['actionURL'] = $this->createLink('bug', 'browse', "productID=$productID&browseType=bySearch"); + $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); + $this->config->bug->search['params']['resolvedBuild']['values'] = $this->build->getProductBuildPairs($productID); $this->view->searchForm = $this->fetch('search', 'buildForm', $this->config->bug->search); /* 设置菜单,登记session。*/