diff --git a/module/bug/config.php b/module/bug/config.php index cc353b1434..9fe7648fd6 100644 --- a/module/bug/config.php +++ b/module/bug/config.php @@ -165,7 +165,7 @@ $config->bug->search['params']['lastEditedDate']= array('operator' => '=', $config->bug->search['params']['deadline'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); $config->bug->datatable = new stdclass(); -$config->bug->datatable->defaultField = array('id', 'severity', 'pri', 'title', 'status', 'openedBy', 'openedDate', 'assignedTo', 'resolution', 'actions'); +$config->bug->datatable->defaultField = array('id', 'severity', 'pri', 'confirmed', 'title', 'status', 'openedBy', 'openedDate', 'assignedTo', 'resolution', 'actions'); $config->bug->datatable->fieldList['id']['title'] = 'idAB'; $config->bug->datatable->fieldList['id']['fixed'] = 'left'; @@ -182,6 +182,11 @@ $config->bug->datatable->fieldList['pri']['fixed'] = 'left'; $config->bug->datatable->fieldList['pri']['width'] = '50'; $config->bug->datatable->fieldList['pri']['required'] = 'no'; +$config->bug->datatable->fieldList['confirmed']['title'] = 'confirmedAB'; +$config->bug->datatable->fieldList['confirmed']['fixed'] = 'left'; +$config->bug->datatable->fieldList['confirmed']['width'] = '60'; +$config->bug->datatable->fieldList['confirmed']['required'] = 'no'; + $config->bug->datatable->fieldList['title']['title'] = 'title'; $config->bug->datatable->fieldList['title']['fixed'] = 'left'; $config->bug->datatable->fieldList['title']['width'] = 'auto'; diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index 3193521650..284d21b89b 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -34,6 +34,7 @@ $lang->bug->activatedCount = 'Activation Times'; $lang->bug->activatedCountAB = 'Activation'; $lang->bug->activatedDate = 'ActivatedDate'; $lang->bug->confirmed = 'Confirmed'; +$lang->bug->confirmedAB = 'C'; $lang->bug->toTask = 'Convert to Task'; $lang->bug->toStory = 'Convert to Story'; $lang->bug->mailto = 'Mailto'; @@ -246,8 +247,8 @@ $lang->bug->statusList['active'] = 'Active'; $lang->bug->statusList['resolved'] = 'Solved'; $lang->bug->statusList['closed'] = 'Closed'; -$lang->bug->confirmedList[1] = 'Confirmed'; -$lang->bug->confirmedList[0] = 'Unconfirmed'; +$lang->bug->confirmedList[1] = 'Yes'; +$lang->bug->confirmedList[0] = 'No'; $lang->bug->resolutionList[''] = ''; $lang->bug->resolutionList['bydesign'] = 'As Design'; diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php index a51b6da0dd..1149bafb6c 100644 --- a/module/bug/lang/zh-cn.php +++ b/module/bug/lang/zh-cn.php @@ -34,6 +34,7 @@ $lang->bug->activatedCount = '激活次数'; $lang->bug->activatedCountAB = '激活次数'; $lang->bug->activatedDate = '激活日期'; $lang->bug->confirmed = '是否确认'; +$lang->bug->confirmedAB = '已确认'; $lang->bug->toTask = '转任务'; $lang->bug->toStory = '转需求'; $lang->bug->mailto = '抄送给'; @@ -245,8 +246,8 @@ $lang->bug->statusList['active'] = '激活'; $lang->bug->statusList['resolved'] = '已解决'; $lang->bug->statusList['closed'] = '已关闭'; -$lang->bug->confirmedList[1] = '已确认'; -$lang->bug->confirmedList[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 cd81273fda..ad0949c34d 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -2443,6 +2443,10 @@ class bugModel extends model $class .= ' bug-' . $bug->status; $title = "title='" . zget($this->lang->bug->statusList, $bug->status) . "'"; } + if($id == 'confirmed') + { + $class .= ' text-center'; + } if($id == 'title') { $class .= ' text-left'; @@ -2488,9 +2492,11 @@ class bugModel extends model echo zget($this->lang->bug->priList, $bug->pri, $bug->pri); echo ""; break; - case 'title': + case 'confirmed': $class = 'confirm' . $bug->confirmed; - echo "[{$this->lang->bug->confirmedList[$bug->confirmed]}] "; + echo "" . zget($this->lang->bug->confirmedList, $bug->confirmed, $bug->confirmed) . " "; + break; + case 'title': if($bug->branch and isset($branches[$bug->branch])) echo "{$branches[$bug->branch]} "; if($bug->module and isset($modulePairs[$bug->module])) echo "{$modulePairs[$bug->module]} "; echo $canView ? html::a($bugLink, $bug->title, null, "style='color: $bug->color'") : "{$bug->title}"; diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php index dab1853322..e4b6affc0f 100644 --- a/module/bug/view/browse.html.php +++ b/module/bug/view/browse.html.php @@ -184,8 +184,9 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow { if($value->show) { - if($this->app->getClientLang() == 'en' and $value->id == 'severity') $value->name = 'Severity'; - if($this->app->getClientLang() == 'en' and $value->id == 'pri') $value->name = 'Priority'; + if($this->app->getClientLang() == 'en' and $value->id == 'severity') $value->name = $lang->bug->severity; + if($this->app->getClientLang() == 'en' and $value->id == 'pri') $value->name = $lang->bug->pri; + if($this->app->getClientLang() == 'en' and $value->id == 'confirmed') $value->name = $lang->bug->confirmed; $this->datatable->printHead($value, $orderBy, $vars); $columns ++; }