From c794b45e6e0436f5f6f662f6e7ef63df131497f9 Mon Sep 17 00:00:00 2001 From: wangchunsheng Date: Sat, 27 Mar 2010 02:55:46 +0000 Subject: [PATCH] + add pri and keywords fields to bug table. --- module/bug/config.php | 4 ++++ module/bug/lang/zh-cn.php | 8 ++++++++ module/bug/model.php | 4 ++-- module/bug/view/browse.html.php | 2 ++ module/bug/view/create.html.php | 4 ++++ module/bug/view/edit.html.php | 8 ++++++++ module/bug/view/view.html.php | 11 +++++++++-- module/convert/converter/bugfree2.php | 4 ++-- 8 files changed, 39 insertions(+), 6 deletions(-) diff --git a/module/bug/config.php b/module/bug/config.php index b885004ba7..6be3ca99b0 100644 --- a/module/bug/config.php +++ b/module/bug/config.php @@ -3,6 +3,7 @@ global $lang; $config->bug->search['module'] = 'bug'; $config->bug->search['fields']['id'] = $lang->bug->id; $config->bug->search['fields']['title'] = $lang->bug->title; +$config->bug->search['fields']['keywords'] = $lang->bug->keywords; $config->bug->search['fields']['steps'] = $lang->bug->steps; $config->bug->search['fields']['assignedTo'] = $lang->bug->assignedTo; $config->bug->search['fields']['resolvedBy'] = $lang->bug->resolvedBy; @@ -14,6 +15,7 @@ $config->bug->search['fields']['closedBy'] = $lang->bug->closedBy; $config->bug->search['fields']['lastEditedBy'] = $lang->bug->lastEditedBy; $config->bug->search['fields']['status'] = $lang->bug->status; $config->bug->search['fields']['severity'] = $lang->bug->severity; +$config->bug->search['fields']['pri'] = $lang->bug->pri; $config->bug->search['fields']['type'] = $lang->bug->type; $config->bug->search['fields']['os'] = $lang->bug->os; $config->bug->search['fields']['browser'] = $lang->bug->browser; @@ -28,6 +30,7 @@ $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']['keywords'] = array('operator' => 'include', 'control' => 'input', 'values' => ''); $config->bug->search['params']['steps'] = array('operator' => 'include', 'control' => 'input', 'values' => ''); $config->bug->search['params']['product'] = array('operator' => '=', 'control' => 'select', 'values' => ''); $config->bug->search['params']['module'] = array('operator' => '=', 'control' => 'select', 'values' => 'modules'); @@ -39,6 +42,7 @@ $config->bug->search['params']['closedBy'] = array('operator' => '=', $config->bug->search['params']['lastEditedBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); $config->bug->search['params']['status'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->bug->statusList); $config->bug->search['params']['severity'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->bug->severityList); +$config->bug->search['params']['pri'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->bug->priList); $config->bug->search['params']['type'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->bug->typeList); $config->bug->search['params']['os'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->bug->osList); $config->bug->search['params']['browser'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->bug->browserList); diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php index 543da7c6e0..371d894fea 100644 --- a/module/bug/lang/zh-cn.php +++ b/module/bug/lang/zh-cn.php @@ -82,6 +82,12 @@ $lang->bug->severityList[1] = 1; $lang->bug->severityList[2] = 2; $lang->bug->severityList[4] = 4; +$lang->bug->priList[0] = ''; +$lang->bug->priList[3] = 3; +$lang->bug->priList[1] = 1; +$lang->bug->priList[2] = 2; +$lang->bug->priList[4] = 4; + /* Define the OS list. */ $lang->bug->osList[''] = ''; $lang->bug->osList['all'] = '全部'; @@ -149,6 +155,7 @@ $lang->bug->storyVersion = '需求版本'; $lang->bug->task = '相关任务'; $lang->bug->title = 'Bug标题'; $lang->bug->severity = '严重程度'; +$lang->bug->pri = '优先级'; $lang->bug->type = 'Bug类型'; $lang->bug->os = '操作系统'; $lang->bug->browser = '浏览器'; @@ -174,6 +181,7 @@ $lang->bug->lastEditedDate = '最后修改日期'; $lang->bug->linkBug = '相关Bug'; $lang->bug->case = '相关用例'; $lang->bug->files = '附件'; +$lang->bug->keywords = '关键词'; $lang->bug->tblStep = "[步骤]\n"; $lang->bug->tblResult = "[结果]\n"; diff --git a/module/bug/model.php b/module/bug/model.php index e0f7a2b541..93cb3ee016 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -46,7 +46,7 @@ class bugModel extends model ->setDefault('openedBuild', '') ->setIF($this->post->assignedTo != '', 'assignedDate', $now) ->setIF($this->post->story != false, 'storyVersion', $this->loadModel('story')->getVersion($this->post->story)) - ->specialChars('title,steps') + ->specialChars('title,steps,keyword') ->cleanInt('product, module, severity') ->join('openedBuild', ',') ->remove('files, labels') @@ -101,7 +101,7 @@ class bugModel extends model $now = helper::now(); $bug = fixer::input('post') ->cleanInt('product,module,severity,project,story,task') - ->specialChars('title,steps') + ->specialChars('title,steps,keyword') ->remove('comment,fiels,labels') ->setDefault('project,module,project,story,task,duplicateBug', 0) ->setDefault('openedBuild', '') diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php index 8048b35c17..56a2f08387 100644 --- a/module/bug/view/browse.html.php +++ b/module/bug/view/browse.html.php @@ -90,6 +90,7 @@ function browseBySearch(active) bug->id);?> bug->severity);?> + bug->pri);?> bug->title);?> bug->openedBy);?> bug->assignedTo);?> @@ -102,6 +103,7 @@ function browseBySearch(active) createLink('bug', 'view', "bugID=$bug->id"), sprintf('%03d', $bug->id));?> bug->severityList[$bug->severity]?> + bug->priList[$bug->pri]?> title;?> openedBy];?> assignedTo == $this->app->user->account) echo 'style=color:red';?>>assignedTo];?> diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php index 84284b943d..eabd5d5010 100644 --- a/module/bug/view/create.html.php +++ b/module/bug/view/create.html.php @@ -170,6 +170,10 @@ $(function() { bug->steps;?> + + bug->keywords;?> + + bug->files;?> fetch('file', 'buildform');?> diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php index bde95ed923..965d036d3a 100644 --- a/module/bug/view/edit.html.php +++ b/module/bug/view/edit.html.php @@ -207,6 +207,10 @@ $(function() { bug->severity;?> bug->severityList, $bug->severity, 'class=select-3');?> + + bug->pri;?> + bug->priList, $bug->pri, 'class=select-3');?> + bug->status;?> bug->statusList, $bug->status, 'class=select-3');?> @@ -300,6 +304,10 @@ $(function() { bug->case;?> case, 'class="text-3"');?> + + bug->keywords;?> + keywords, 'class="text-3"');?> + diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php index 4553d18b74..25284bf351 100644 --- a/module/bug/view/view.html.php +++ b/module/bug/view/view.html.php @@ -89,10 +89,13 @@ bug->type;?> bug->typeList[$bug->type])) echo $lang->bug->typeList[$bug->type]; else echo $bug->type;?> - bug->severity;?> - severity;?> + bug->severityList[$bug->severity];?> + + + bug->pri;?> + bug->priList[$bug->pri];?> bug->status;?> @@ -207,6 +210,10 @@ bug->case;?> caseTitle)) echo html::a($this->createLink('testcase', 'view', "caseID=$bug->case"), "#$bug->case $bug->caseTitle", '_blank');?> + + bug->keywords;?> + keywords;?> + diff --git a/module/convert/converter/bugfree2.php b/module/convert/converter/bugfree2.php index 2d4a674686..63ba652ab9 100644 --- a/module/convert/converter/bugfree2.php +++ b/module/convert/converter/bugfree2.php @@ -206,7 +206,7 @@ class bugfree2ConvertModel extends bugfreeConvertModel resolvedBy, resolution, resolvedBuild, resolvedDate, closedBy, closedDate, lastEditedBy, lastEditedDate, - bugKeyword AS keyword + bugKeyword AS keywords ') ->from(BUGFREE_TABLE_BUGINFO) ->where('isDroped')->eq(0) @@ -268,7 +268,7 @@ class bugfree2ConvertModel extends bugfreeConvertModel lastEditedBy, lastEditedDate, scriptedBy, scriptedDate, scriptStatus, scriptLocation, linkID AS linkCase, - casekeyword AS keyword, + casekeyword AS keywords, DisplayOrder AS `order`, 1 AS version, bugID