* Code for task #47991.

This commit is contained in:
hufangzhou
2022-01-24 13:52:49 +08:00
parent bdf0e65bcd
commit 7cd0246265
5 changed files with 24 additions and 2 deletions
+20
View File
@@ -867,6 +867,10 @@ function createColumnCreateMenu(options)
if(privs.includes('createCard')) items.push({label: kanbanLang.createCard, url: $.createLink('kanban', 'createCard', 'kanbanID=' + kanbanID + '&regionID=' + regionID + '&groupID=' + groupID + '&columnID=' + columnID), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}});
if(privs.includes('batchCreateCard')) items.push({label: kanbanLang.batchCreateCard, url: $.createLink('kanban', 'batchCreateCard', 'kanbanID=' + kanbanID + '&regionID=' + regionID + '&groupID=' + groupID + '&laneID=' + laneID + '&columnID=' + columnID), attrs: {'data-width': '80%'}});
if(privs.includes('import') && kanban.importObject.indexOf('cards') != -1) items.push({label: kanbanLang.importCard, url: $.createLink('kanban', 'importCard', 'kanbanID=' + kanbanID + '&regionID=' + regionID + '&groupID=' + groupID + '&laneID=' + laneID + '&columnID=' + columnID), attrs: {'data-width': '80%'}});
if(privs.includes('import') && kanban.importObject) items.push({className: 'parentDivider'});
if(privs.includes('import') && kanban.importObject) items.push({label: kanbanLang.importAB, className: 'import'});
return items;
}
@@ -984,6 +988,22 @@ $(function()
if(!items || !items.length) return;
$.zui.ContextMenu.show(items, items.$options || {event: event});
$('.parentDivider').parent().addClass('divider');
$('.import').parent().addClass('dropdown-submenu top');
/* The submenu of import. */
var importPlanLink = createLink('kanban', 'importPlan');
var importReleaseLink = createLink('kanban', 'importRelease');
var importExecutionLink = createLink('kanban', 'importExecution');
var importBuildLink = createLink('kanban', 'importBuild');
var importPlanLink = kanban.importObject.indexOf('plan') != -1 ? '<li><a href="' + createLink('kanban', 'importPlan') + '">' + kanbanLang.importPlan + '</a></li>' : '';
var importReleaseLink = kanban.importObject.indexOf('release') != -1 ? '<li><a href="' + createLink('kanban', 'importRelease') + '">' + kanbanLang.importRelease + '</a></li>' : '';
var importExecutionLink = kanban.importObject.indexOf('execution') != -1 ? '<li><a href="' + createLink('kanban', 'importExecution') + '">' + kanbanLang.importExecution + '</a></li>' : '';
var importBuildLink = kanban.importObject.indexOf('build') != -1 ? '<li><a href="' + createLink('kanban', 'importBuild') + '">' + kanbanLang.importBuild + '</a></li>' : '';
var importSubmenu = '<ul class="dropdown-menu">' + importPlanLink + importReleaseLink + importExecutionLink + importBuildLink +'</ul>';
$('.import').parent().append(importSubmenu);
});
/* Adjust the add button position on window resize */
+1
View File
@@ -63,6 +63,7 @@ $lang->kanban->restore = 'Restore';
$lang->kanban->child = 'Child';
$lang->kanban->batchCreateCard = 'Batchcreate Card';
$lang->kanban->import = 'Import';
$lang->kanban->importAB = 'Import';
$lang->kanban->showClosed = 'Closed';
/* Fields. */
+1
View File
@@ -63,6 +63,7 @@ $lang->kanban->restore = '还原';
$lang->kanban->child = '子';
$lang->kanban->batchCreateCard = '批量创建卡片';
$lang->kanban->import = '导入功能';
$lang->kanban->importAB = '导入';
$lang->kanban->showClosed = '显示已关闭';
/* Fields. */
+1 -1
View File
@@ -886,7 +886,7 @@ class kanbanModel extends model
->orderBy($order)
->fetchGroup('group');
$actions = array('createColumn', 'setColumn', 'setWIP', 'archiveColumn', 'restoreColumn', 'deleteColumn', 'createCard', 'batchCreateCard', 'splitColumn', 'sortColumn');
$actions = array('createColumn', 'setColumn', 'setWIP', 'archiveColumn', 'restoreColumn', 'deleteColumn', 'createCard', 'batchCreateCard', 'splitColumn', 'import', 'sortColumn');
/* Group by parent. */
$parentColumnGroup = array();
+1 -1
View File
@@ -51,7 +51,7 @@ class todoModel extends model
if($todo->pri == 'low') $todo->pri = 3;
}
if($todo->type != 'custom')
if($todo->type != 'custom' and $todo->idvalue)
{
$type = $todo->type;
$object = $this->loadModel($type)->getByID($this->post->$type);