Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

+ add pri and keywords fields to bug table.

Browse Source
This commit is contained in:
wangchunsheng
2010-03-27 02:55:46 +00:00
parent 7056018ef1
commit 2b6af22662
8 changed files with 39 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
trunk/module/bug/config.php
View File

@@ -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);

8
trunk/module/bug/lang/zh-cn.php
View File

@@ -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";

4
trunk/module/bug/model.php
View File

@@ -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', '')

2
trunk/module/bug/view/browse.html.php
View File

@@ -90,6 +90,7 @@ function browseBySearch(active)
<tr class='colhead'>
<th><?php common::printOrderLink('id', $orderBy, $vars, $lang->bug->id);?></th>
<th><?php common::printOrderLink('severity', $orderBy, $vars, $lang->bug->severity);?></th>
<th><?php common::printOrderLink('pri', $orderBy, $vars, $lang->bug->pri);?></th>
<th class='w-p50'><?php common::printOrderLink('title', $orderBy, $vars, $lang->bug->title);?></th>
<th><?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->bug->openedBy);?></th>
<th><?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->bug->assignedTo);?></th>
@@ -102,6 +103,7 @@ function browseBySearch(active)
<tr class='a-center'>
<td><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), sprintf('%03d', $bug->id));?></td>
<td><?php echo $lang->bug->severityList[$bug->severity]?></td>
<td><?php echo $lang->bug->priList[$bug->pri]?></td>
<td class='a-left nobr'><?php echo $bug->title;?></td>
<td><?php echo $users[$bug->openedBy];?></td>
<td <?php if($bug->assignedTo == $this->app->user->account) echo 'style=color:red';?>><?php echo $users[$bug->assignedTo];?></td>

4
trunk/module/bug/view/create.html.php
View File

@@ -170,6 +170,10 @@ $(function() {
<th class='rowhead'><?php echo $lang->bug->steps;?></th>
<td><?php echo html::textarea('steps', '', "class='area-1' rows='6'");?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->bug->keywords;?></th>
<td><?php echo html::input('keywords', '', "class='text-1'");?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->bug->files;?></th>
<td><?php echo $this->fetch('file', 'buildform');?></td>

8
trunk/module/bug/view/edit.html.php
View File

@@ -207,6 +207,10 @@ $(function() {
<td class='rowhead'><?php echo $lang->bug->severity;?></td>
<td><?php echo html::select('severity', $lang->bug->severityList, $bug->severity, 'class=select-3');?>
</tr>
<tr>
<td class='rowhead'><?php echo $lang->bug->pri;?></td>
<td><?php echo html::select('pri', $lang->bug->priList, $bug->pri, 'class=select-3');?>
</tr>
<tr>
<td class='rowhead'><?php echo $lang->bug->status;?></td>
<td><?php echo html::select('status', $lang->bug->statusList, $bug->status, 'class=select-3');?></td>
@@ -300,6 +304,10 @@ $(function() {
<td class='rowhead'><?php echo $lang->bug->case;?></td>
<td><?php echo html::input('case', $bug->case, 'class="text-3"');?></td>
</tr>
<tr>
<td class='rowhead'><?php echo $lang->bug->keywords;?></td>
<td><?php echo html::input('keywords', $bug->keywords, 'class="text-3"');?></td>
</tr>
</table>
</fieldset>
</div>

11
trunk/module/bug/view/view.html.php
View File

@@ -89,10 +89,13 @@
<td class='rowhead'><?php echo $lang->bug->type;?></td>
<td><?php if(isset($lang->bug->typeList[$bug->type])) echo $lang->bug->typeList[$bug->type]; else echo $bug->type;?></td>
</tr>
<tr>
<td class='rowhead'><?php echo $lang->bug->severity;?></td>
<td><strong><?php echo $bug->severity;?></strong></td>
<td><strong><?php echo $lang->bug->severityList[$bug->severity];?></strong></td>
</tr>
<tr>
<td class='rowhead'><?php echo $lang->bug->pri;?></td>
<td><strong><?php echo $lang->bug->priList[$bug->pri];?></strong></td>
</tr>
<tr>
<td class='rowhead'><?php echo $lang->bug->status;?></td>
@@ -207,6 +210,10 @@
<td class='rowhead'><?php echo $lang->bug->case;?></td>
<td><?php if(isset($bug->caseTitle)) echo html::a($this->createLink('testcase', 'view', "caseID=$bug->case"), "#$bug->case $bug->caseTitle", '_blank');?></td>
</tr>
<tr>
<td class='rowhead'><?php echo $lang->bug->keywords;?></td>
<td><?php echo $bug->keywords;?></td>
</tr>
</table>
</fieldset>
</div>

4
trunk/module/convert/converter/bugfree2.php
View File

@@ -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