diff --git a/module/bug/config.php b/module/bug/config.php index c0d9dbf3a2..28310e9973 100644 --- a/module/bug/config.php +++ b/module/bug/config.php @@ -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, diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index e1d759f9cd..c43273410f 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -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'; diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php index be036af9c6..dc253b543d 100644 --- a/module/bug/lang/zh-cn.php +++ b/module/bug/lang/zh-cn.php @@ -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'] = '设计如此'; diff --git a/module/bug/model.php b/module/bug/model.php index bb468f0cc0..05e5ff28ab 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -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(); diff --git a/module/bug/view/browse.custom.html.php b/module/bug/view/browse.custom.html.php index 19fc5e7d7c..8c876607b3 100644 --- a/module/bug/view/browse.custom.html.php +++ b/module/bug/view/browse.custom.html.php @@ -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; diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php index 337aeb864c..92ee0f5b13 100644 --- a/module/bug/view/browse.html.php +++ b/module/bug/view/browse.html.php @@ -104,8 +104,8 @@ var customed = ; bug->severityList[$bug->severity]?> bug->priList[$bug->pri]?> - confirm;?> - [{$lang->bug->confirmList[$bug->confirm]}] " . html::a($bugLink, $bug->title);?> + confirmed;?> + [{$lang->bug->confirmedList[$bug->confirmed]}] " . html::a($bugLink, $bug->title);?> cookie->windowWidth >= $this->config->wideSize):?> bug->statusList[$bug->status];?> diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php index a859d1cfcf..3db2107e0e 100644 --- a/module/bug/view/edit.html.php +++ b/module/bug/view/edit.html.php @@ -98,8 +98,8 @@ userList = "".split(',' bug->statusList, $bug->status, 'class=select-3');?> - bug->confirm;?> - bug->confirmList[$bug->confirm];?> + bug->confirmed;?> + bug->confirmedList[$bug->confirmed];?> bug->assignedTo;?> diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php index 52b5a3a2e5..debdc54280 100644 --- a/module/bug/view/view.html.php +++ b/module/bug/view/view.html.php @@ -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 @@ 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 @@ bug->statusList[$bug->status];?> - bug->confirm;?> - bug->confirmList[$bug->confirm];?> + bug->confirmed;?> + bug->confirmedList[$bug->confirmed];?> bug->lblAssignedTo;?>