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

Merge branch 'master' of https://github.com/easysoft/zentaopms

Browse Source
This commit is contained in:
Yagami
2019-07-02 16:10:59 +08:00
parent 68dc518853 655c961a8b
commit b99a15631a
6 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/config.php
+6 -1
View File
@@ -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';
module/bug/lang/en.php
+3 -2
View File
@@ -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';
module/bug/lang/zh-cn.php
+3 -2
View File
@@ -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'] = '设计如此';
module/bug/model.php
+8 -2
View File
@@ -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 "</span>";
break;
case 'title':
case 'confirmed':
$class = 'confirm' . $bug->confirmed;
echo "<span class='$class'>[{$this->lang->bug->confirmedList[$bug->confirmed]}]</span> ";
echo "<span class='$class'>" . zget($this->lang->bug->confirmedList, $bug->confirmed, $bug->confirmed) . "</span> ";
break;
case 'title':
if($bug->branch and isset($branches[$bug->branch])) echo "<span class='label label-outline label-badge'>{$branches[$bug->branch]}</span> ";
if($bug->module and isset($modulePairs[$bug->module])) echo "<span class='label label-gray label-badge'>{$modulePairs[$bug->module]}</span> ";
echo $canView ? html::a($bugLink, $bug->title, null, "style='color: $bug->color'") : "<span style='color: $bug->color'>{$bug->title}</span>";
module/bug/view/browse.html.php
+3 -2
View File
@@ -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 ++;
}
module/search/lang/en.php
+4 -4
View File
@@ -39,10 +39,10 @@ $lang->search->operators['>'] = '>';
$lang->search->operators['>='] = '>=';
$lang->search->operators['<'] = '<';
$lang->search->operators['<='] = '<=';
$lang->search->operators['include'] = 'INCLUDE';
$lang->search->operators['between'] = 'BETWEEN';
$lang->search->operators['notinclude'] = 'EXCLUDE';
$lang->search->operators['belong'] = 'BELONG';
$lang->search->operators['include'] = 'Include';
$lang->search->operators['between'] = 'Between';
$lang->search->operators['notinclude'] = 'Exclude';
$lang->search->operators['belong'] = 'Belong';
$lang->search->andor['and'] = 'And';
$lang->search->andor['or'] = 'Or';