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

Merge branch 'sprint/238_wangzemei_68933' into 'master'

Browse Source 
Sprint/238 wangzemei 68933

See merge request easycorp/zentaopms!5478
This commit is contained in:
李玉春
2022-09-22 06:09:46 +00:00
parent d4ed48e790 b77ad0dff7
commit 3aefc5bee0
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/product/view/browse.html.php
+1
View File
@@ -41,6 +41,7 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
.btn-group a i.icon-plus, .btn-group a i.icon-link {font-size: 16px;}
.btn-group a.btn-secondary, .btn-group a.btn-primary {border-right: 1px solid rgba(255,255,255,0.2);}
.btn-group button.dropdown-toggle.btn-secondary, .btn-group button.dropdown-toggle.btn-primary {padding:6px;}
#productStoryForm table tbody tr td.c-actions {overflow: visible;}
#productStoryForm table tbody tr td.c-actions .dividing-line {width: 1px; height: 16px; display: inline-block; vertical-align: middle; background: #E4E4E4; margin: 0 4px 0 0;}
</style>
module/story/config.php
+4
View File
@@ -58,6 +58,10 @@ if($app->tab == 'execution')
{
$config->story->datatable->defaultField = array('id','order', 'pri', 'title', 'plan', 'openedBy', 'assignedTo', 'estimate', 'status', 'stage', 'taskCount', 'actions');
}
else if($app->tab == 'product')
{
$config->story->datatable->defaultField = array('id', 'title', 'plan', 'pri', 'status', 'openedBy', 'estimate', 'reviewedBy', 'stage', 'assignedTo', 'taskCount', 'actions');
}
else
{
$config->story->datatable->defaultField = array('id', 'pri', 'title', 'plan', 'openedBy', 'assignedTo', 'estimate', 'status', 'stage', 'taskCount', 'actions');
module/story/lang/zh-cn.php
+3 -3
View File
@@ -126,10 +126,10 @@ $lang->story->stageAB = '阶段';
$lang->story->stagedBy = '设置阶段者';
$lang->story->mailto = '抄送给';
$lang->story->openedBy = '由谁创建';
$lang->story->openedByAB = '创建';
$lang->story->openedByAB = '创建者';
$lang->story->openedDate = '创建日期';
$lang->story->assignedTo = '指派给';
$lang->story->assignedToAB = '指派';
$lang->story->assignedToAB = '指派给';
$lang->story->assignedDate = '指派日期';
$lang->story->lastEditedBy = '最后修改';
$lang->story->lastEditedDate = '最后修改日期';
@@ -139,7 +139,7 @@ $lang->story->closedReason = '关闭原因';
$lang->story->rejectedReason = '拒绝原因';
$lang->story->changedBy = '由谁变更';
$lang->story->changedDate = '变更时间';
$lang->story->reviewedBy = '由谁评审';
$lang->story->reviewedBy = '评审者';
$lang->story->reviewer = $lang->story->reviewedBy;
$lang->story->reviewers = '评审人员';
$lang->story->reviewedDate = '评审时间';