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

* change confirm to confirmed.

Browse Source 
* adjust the confirmed logic.
This commit is contained in:
wangchunsheng
2011-10-28 06:04:42 +00:00
parent 5b58f8126e
commit 0ebaae32a5
8 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/config.php
+5 -5
View File
@@ -15,7 +15,7 @@ $config->bug->search['fields']['closedBy'] = $lang->bug->closedBy;
$config->bug->search['fields']['lastEditedBy'] = $lang->bug->lastEditedByAB;
$config->bug->search['fields']['status'] = $lang->bug->status;
$config->bug->search['fields']['activatedCount'] = $lang->bug->activatedCount;
$config->bug->search['fields']['confirm'] = $lang->bug->confirm;
$config->bug->search['fields']['confirmed'] = $lang->bug->confirmed;
$config->bug->search['fields']['severity'] = $lang->bug->severity;
$config->bug->search['fields']['pri'] = $lang->bug->pri;
$config->bug->search['fields']['type'] = $lang->bug->type;
@@ -43,8 +43,8 @@ $config->bug->search['params']['openedBy'] = array('operator' => '=',
$config->bug->search['params']['closedBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users');
$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']['activatedCount']= array('operator' => '=', 'control' => 'input', 'values' => '');
$config->bug->search['params']['confirm'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->bug->confirmList);
$config->bug->search['params']['activatedCount']= array('operator' => '>=', 'control' => 'input', 'values' => '');
$config->bug->search['params']['confirmed'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->bug->confirmedList);
$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);
@@ -66,7 +66,7 @@ $config->bug->resolve->requiredFields = 'resolution';
$config->bug->list->allFields = 'id, module, project, story, task,
title, keywords, severity, pri, type, os, browser, hardware,
found, steps, status, activatedCount, confirm, mailto,
found, steps, status, activatedCount, confirmed, mailto,
openedBy, openedDate, openedBuild,
assignedTo, assignedDate,
resolvedBy, resolution, resolvedBuild, resolvedDate,
@@ -79,7 +79,7 @@ $config->bug->list->defaultFields = 'id,severity,pri,title,openedBy,assignedTo,r
$config->bug->list->exportFields = 'id, product, module, project, story, task,
title, keywords, severity, pri, type, os, browser,
steps, status, activatedCount, confirm, mailto,
steps, status, activatedCount, confirmed, mailto,
openedBy, openedDate, openedBuild,
assignedTo, assignedDate,
resolvedBy, resolution, resolvedBuild, resolvedDate,
module/bug/lang/en.php
+3 -3
View File
@@ -34,7 +34,7 @@ $lang->bug->status = 'Status';
$lang->bug->statusAB = 'Status';
$lang->bug->activatedCount = 'Activated count';
$lang->bug->activatedCountAB = 'Activated count';
$lang->bug->confirm = 'Confirm';
$lang->bug->confirmed = 'Confirmed';
$lang->bug->mailto = 'Mailto';
$lang->bug->openedBy = 'Opened By';
$lang->bug->openedByAB = 'Opened';
@@ -214,8 +214,8 @@ $lang->bug->statusList['active'] = 'Active';
$lang->bug->statusList['resolved'] = 'Resolved';
$lang->bug->statusList['closed'] = 'Closed';
$lang->bug->confirmList[1] = 'Confirmed';
$lang->bug->confirmList[0] = 'Unconfirm';
$lang->bug->confirmedList[1] = 'Confirmed';
$lang->bug->confirmedList[0] = 'Unconfirmed';
$lang->bug->resolutionList[''] = '';
$lang->bug->resolutionList['bydesign'] = 'By design';
module/bug/lang/zh-cn.php
+4 -4
View File
@@ -34,7 +34,7 @@ $lang->bug->status = 'Bug状态';
$lang->bug->statusAB = '状态';
$lang->bug->activatedCount = '激活次数';
$lang->bug->activatedCountAB = '激活次数';
$lang->bug->confirm = '确认状态';
$lang->bug->confirmed = '是否确认';
$lang->bug->mailto = '抄送给';
$lang->bug->openedBy = '由谁创建';
$lang->bug->openedByAB = '创建';
@@ -65,7 +65,7 @@ $lang->bug->lastEditedDateAB = '修改日期';
/* 方法列表。*/
$lang->bug->index = '首页';
$lang->bug->create = '创建Bug';
$lang->bug->confirmBug = '确认Bug';
$lang->bug->confirmBug = '确认';
$lang->bug->edit = '编辑Bug';
$lang->bug->browse = 'Bug列表';
$lang->bug->view = 'Bug详情';
@@ -214,8 +214,8 @@ $lang->bug->statusList['active'] = '激活';
$lang->bug->statusList['resolved'] = '已解决';
$lang->bug->statusList['closed'] = '已关闭';
$lang->bug->confirmList[1] = '已确认';
$lang->bug->confirmList[0] = '未确认';
$lang->bug->confirmedList[1] = '已确认';
$lang->bug->confirmedList[0] = '未确认';
$lang->bug->resolutionList[''] = '';
$lang->bug->resolutionList['bydesign'] = '设计如此';
module/bug/model.php
+8 -3
View File
@@ -157,7 +157,8 @@ class bugModel extends model
->setIF($this->post->closedBy != '' or $this->post->closedDate != '', 'status', 'closed')
->setIF(($this->post->resolution != '' or $this->post->resolvedDate != '') and $this->post->assignedTo == '', 'assignedTo', $oldBug->openedBy)
->setIF(($this->post->resolution != '' or $this->post->resolvedDate != '') and $this->post->assignedTo == '', 'assignedDate', $now)
->setIF($this->post->resolution == '' and $this->post->resolvedDate =='', 'status', 'active')
->setIF($this->post->resolution == '' and $this->post->resolvedDate =='', 'status', 'active')
->setIF($this->post->resolution != '', 'confirmed', 1)
->setIF($this->post->story != false and $this->post->story != $oldBug->story, 'storyVersion', $this->loadModel('story')->getVersion($this->post->story))
->get();
@@ -182,7 +183,10 @@ class bugModel extends model
public function confirm($bugID)
{
$now = helper::now();
$this->dao->update(TABLE_BUG)->set('confirm')->eq(1)->set('confirmedBy')->eq($this->app->user->account)->set('confirmedDate')->eq($now)->where('id')->eq($bugID)->exec();
$bug->confirmed = 1;
$bug->lastEditedBy = $this->app->user->account;
$bug->lastEditedDate = $now;
$this->dao->update(TABLE_BUG)->data($bug)->where('id')->eq($bugID)->exec();
}
/**
@@ -200,7 +204,7 @@ class bugModel extends model
->add('resolvedBy', $this->app->user->account)
->add('resolvedDate', $now)
->add('status', 'resolved')
->add('confirm', 1)
->add('confirmed', 1)
->add('assignedDate', $now)
->add('lastEditedBy', $this->app->user->account)
->add('lastEditedDate', $now)
@@ -269,6 +273,7 @@ class bugModel extends model
->add('closedDate', $now)
->add('lastEditedBy', $this->app->user->account)
->add('lastEditedDate', $now)
->add('confirmed', 1)
->remove('comment')
->get();
module/bug/view/browse.custom.html.php
+1 -1
View File
@@ -38,7 +38,7 @@
{
echo $users[$bug->$fieldName];
}
elseif(preg_match('/^(severity|pri|resolution|os|type|browse|status|confirm)$/i', $fieldName))
elseif(preg_match('/^(severity|pri|resolution|os|type|browse|status|confirmed)$/i', $fieldName))
{
$key = $fieldName . 'List';
$list = $lang->bug->$key;
module/bug/view/browse.html.php
+2 -2
View File
@@ -104,8 +104,8 @@ var customed = <?php echo (int)$customed;?>;
<td><?php echo $lang->bug->severityList[$bug->severity]?></td>
<td><?php echo $lang->bug->priList[$bug->pri]?></td>
<?php $class = 'confirm' . $bug->confirm;?>
<td class='a-left nobr'><?php echo "<span class='$class'>[{$lang->bug->confirmList[$bug->confirm]}] </span>" . html::a($bugLink, $bug->title);?></td>
<?php $class = 'confirm' . $bug->confirmed;?>
<td class='a-left nobr'><?php echo "<span class='$class'>[{$lang->bug->confirmedList[$bug->confirmed]}] </span>" . html::a($bugLink, $bug->title);?></td>
<?php if($this->cookie->windowWidth >= $this->config->wideSize):?>
<td><?php echo $lang->bug->statusList[$bug->status];?></td>
module/bug/view/edit.html.php
+2 -2
View File
@@ -98,8 +98,8 @@ userList = "<?php echo join(',', array_keys($users));?>".split(','
<td><?php echo html::select('status', $lang->bug->statusList, $bug->status, 'class=select-3');?></td>
</tr>
<tr>
<td class='rowhead'><?php echo $lang->bug->confirm;?></td>
<td><?php echo $lang->bug->confirmList[$bug->confirm];?></td>
<td class='rowhead'><?php echo $lang->bug->confirmed;?></td>
<td><?php echo $lang->bug->confirmedList[$bug->confirmed];?></td>
</tr>
<tr>
<td class='rowhead'><?php echo $lang->bug->assignedTo;?></td>
module/bug/view/view.html.php
+4 -4
View File
@@ -21,7 +21,7 @@
$convertParams = "productID=$productID&moduleID=0&testcaseID=0&extras=bugID=$bug->id";
if(!$bug->deleted)
{
if(!($bug->status == 'active' and $bug->confirm == 0 and common::printLink('bug', 'confirmBug', $params, $lang->bug->buttonConfirm))) echo $lang->bug->buttonConfirm . ' ';
if(!($bug->status == 'active' and $bug->confirmed == 0 and common::printLink('bug', 'confirmBug', $params, $lang->bug->buttonConfirm))) echo $lang->bug->buttonConfirm . ' ';
common::printLink('bug', 'edit', $params, $lang->bug->buttonEdit);
if(!($bug->status == 'active' and common::printLink('bug', 'resolve', $params, $lang->bug->buttonResolve))) echo $lang->bug->buttonResolve . ' ';
if(!($bug->status == 'resolved' and common::printLink('bug', 'close', $params, $lang->bug->buttonClose))) echo $lang->bug->buttonClose . ' ';
@@ -48,7 +48,7 @@
<?php
if(!$bug->deleted)
{
if(!($bug->status == 'active' and $bug->confirm == 0 and common::printLink('bug', 'confirmBug', $params, $lang->bug->buttonConfirm))) echo $lang->bug->buttonConfirm . ' ';
if(!($bug->status == 'active' and $bug->confirmed == 0 and common::printLink('bug', 'confirmBug', $params, $lang->bug->buttonConfirm))) echo $lang->bug->buttonConfirm . ' ';
common::printLink('bug', 'edit', $params, $lang->bug->buttonEdit);
if(!($bug->status == 'active' and common::printLink('bug', 'resolve', $params, $lang->bug->buttonResolve))) echo $lang->bug->buttonResolve . ' ';
if(!($bug->status == 'resolved' and common::printLink('bug', 'close', $params, $lang->bug->buttonClose))) echo $lang->bug->buttonClose . ' ';
@@ -98,8 +98,8 @@
<td><strong><?php echo $lang->bug->statusList[$bug->status];?></strong></td>
</tr>
<tr>
<td class='rowhead'><?php echo $lang->bug->confirm;?></td>
<td><strong><?php echo $lang->bug->confirmList[$bug->confirm];?></strong></td>
<td class='rowhead'><?php echo $lang->bug->confirmed;?></td>
<td><strong><?php echo $lang->bug->confirmedList[$bug->confirmed];?></strong></td>
</tr>
<tr>
<td class='rowhead'><?php echo $lang->bug->lblAssignedTo;?></td>