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

Merge branch 'sprint/168' into 'sprint/168_liyuchun_43954'

Browse Source 
# Conflicts:
#   module/kanban/lang/en.php
#   module/kanban/lang/zh-cn.php
This commit is contained in:
孙广明
2021-11-09 05:04:22 +00:00
parent 7589eca470 72a6f47b38
commit a8ce426a32
8 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/view/kanban.html.php
+2 -1
View File
@@ -401,6 +401,7 @@ $.extend($.fn.kanban.Constructor.DEFAULTS,
itemRender: renderKanbanItem,
useFlex: false,
showCount: true,
showZeroCount: true,
onRenderHeaderCol: function($col, col)
{
if(col.type === 'doingProject') $col.attr('data-span-text', doingText);
@@ -430,7 +431,7 @@ $.extend($.fn.kanban.Constructor.DEFAULTS,
$kanban.find('.kanban-header-col[data-type="doingProject"] > .title > .count').text(doingProjectCount || 0);
$kanban.find('.kanban-header-col[data-type="doingExecution"] > .title > .count').text(doingExecutionCount || 0);
},
onCreate(kanban)
onCreate: function(kanban)
{
kanban.$.on('scroll', updateKanbanAffixState);
updateKanbanAffixState();
module/execution/js/kanban.js
+2 -1
View File
@@ -498,6 +498,7 @@ function handleFinishDrop(event)
function handleSortColCards()
{
/* TODO: handle sort cards from column contextmenu */
return false;
}
/**
@@ -513,7 +514,7 @@ function createColumnMenu(options)
var items = [];
if(priv.canEditName) items.push({label: executionLang.editName, url: $.createLink('kanban', 'setColumn', 'col=' + col.columnID + '&executionID=' + executionID), className: 'iframe', attrs: {'data-width': '500px'}})
if(priv.canSetWIP) items.push({label: executionLang.setWIP, url: $.createLink('kanban', 'setWIP', 'col=' + col.columnID + '&executionID=' + executionID), className: 'iframe', attrs: {'data-width': '500px'}})
items.push({label: executionLang.sortColumn, items: ['按ID倒序', '按ID顺序'], className: 'iframe', onClick: handleSortColCards})
if(priv.canSortCards) items.push({label: executionLang.sortColumn, items: ['按ID倒序', '按ID顺序'], className: 'iframe', onClick: handleSortColCards})
return items;
}
module/execution/lang/en.php
+1 -1
View File
@@ -436,7 +436,7 @@ $lang->execution->doingProject = 'Ongoing Projects';
$lang->execution->kanbanColType['wait'] = $lang->execution->statusList['wait'] . ' ' . $lang->execution->common;
$lang->execution->kanbanColType['doing'] = $lang->execution->statusList['doing'] . ' ' . $lang->execution->common;
$lang->execution->kanbanColType['suspended'] = $lang->execution->statusList['suspended'] . ' ' . $lang->execution->common;
$lang->execution->kanbanColType['closed'] = $lang->execution->statusList['closed'] . ' ' . $lang->execution->common;
$lang->execution->kanbanColType['closed'] = $lang->execution->statusList['closed'] . ' ' . $lang->execution->common . '(The recent two executions)';
$lang->execution->treeLevel = array();
$lang->execution->treeLevel['all'] = 'Expand All';
module/execution/lang/zh-cn.php
+1 -1
View File
@@ -436,7 +436,7 @@ $lang->execution->doingProject = '进行中的项目';
$lang->execution->kanbanColType['wait'] = $lang->execution->statusList['wait'] . '的' . $lang->execution->common;
$lang->execution->kanbanColType['doing'] = $lang->execution->statusList['doing'] . '的' . $lang->execution->common;
$lang->execution->kanbanColType['suspended'] = $lang->execution->statusList['suspended'] . '的' . $lang->execution->common;
$lang->execution->kanbanColType['closed'] = $lang->execution->statusList['closed'] . '的' . $lang->execution->common;
$lang->execution->kanbanColType['closed'] = $lang->execution->statusList['closed'] . '的' . $lang->execution->common . '(最近2期)';
$lang->execution->treeLevel = array();
$lang->execution->treeLevel['all'] = '全部展开';
module/execution/view/kanban.html.php
+1
View File
@@ -126,6 +126,7 @@ js::set('priv',
'canSetWIP' => common::hasPriv('kanban', 'setWIP'),
'canSetLane' => common::hasPriv('kanban', 'setLane'),
'canMoveLane' => common::hasPriv('kanban', 'laneMove'),
'canSortCards' => common::hasPriv('kanban', 'cardsSort'),
'canCreateTask' => $canCreateTask,
'canBatchCreateTask' => $canBatchCreateTask,
'canCreateBug' => $canCreateBug,
module/group/lang/resource.php
+2
View File
@@ -609,11 +609,13 @@ $lang->resource->kanban->setLane = 'setLane';
$lang->resource->kanban->setColumn = 'setColumn';
$lang->resource->kanban->setWIP = 'setWIP';
$lang->resource->kanban->laneMove = 'laneMove';
$lang->resource->kanban->cardsSort = 'cardsSort';
$lang->kanban->methodOrder[5] = 'setLane';
$lang->kanban->methodOrder[10] = 'setColumn';
$lang->kanban->methodOrder[15] = 'setWIP';
$lang->kanban->methodOrder[20] = 'laneMove';
$lang->kanban->methodOrder[25] = 'cardsSort';
/* Execution. */
$lang->resource->execution = new stdclass();
module/project/lang/en.php
+1 -1
View File
@@ -161,7 +161,7 @@ $lang->project->typeList['other'] = 'Other Projects';
$lang->project->waitProjects = 'Waiting Projects';
$lang->project->doingProjects = 'Ongoing Projects';
$lang->project->doingExecutions = 'Ongoing Executions';
$lang->project->closedProjects = 'Closed Projects';
$lang->project->closedProjects = 'Closed Projects(The recent two projects)';
$lang->project->noProgram = 'Independent Projects';
$lang->project->laneColorList = array('#32C5FF', '#006AF1', '#9D28B2', '#FF8F26', '#FFC20E', '#00A78E', '#7FBB00', '#424BAC', '#C0E9FF', '#EC2761');
module/project/lang/zh-cn.php
+1 -1
View File
@@ -161,7 +161,7 @@ $lang->project->typeList['other'] = '其他项目';
$lang->project->waitProjects = '未开始的项目';
$lang->project->doingProjects = '进行中的项目';
$lang->project->doingExecutions = '进行中的执行';
$lang->project->closedProjects = '已关闭的项目';
$lang->project->closedProjects = '已关闭的项目(最近2个)';
$lang->project->noProgram = '无项目集归属项目';
$lang->project->laneColorList = array('#32C5FF', '#006AF1', '#9D28B2', '#FF8F26', '#FFC20E', '#00A78E', '#7FBB00', '#424BAC', '#C0E9FF', '#EC2761');