diff --git a/module/action/lang/en.php b/module/action/lang/en.php index 2f29a16128..7c755ebe50 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -194,7 +194,7 @@ $lang->action->desc->importfromgitlab = '$date, Issue associate created from $lang->action->desc->archived = '$date, archived by $actor.' . "\n"; $lang->action->desc->restore = '$date, restore by $actor.' . "\n"; $lang->action->desc->importedcard = '$date, imported to $extra by $actor.' . "\n"; -$lang->action->desc->importedplan = '$date, imported to $extra by $actor.' . "\n"; +$lang->action->desc->importedproductplan = '$date, imported to $extra by $actor.' . "\n"; $lang->action->desc->importedrelease = '$date, imported to $extra by $actor.' . "\n"; $lang->action->desc->importedexecution = '$date, imported to $extra by $actor.' . "\n"; $lang->action->desc->importedbuild = '$date, imported to $extra by $actor.' . "\n"; @@ -338,7 +338,7 @@ $lang->action->label->activatedbychild = 'activated'; $lang->action->label->createchild = 'activated'; $lang->action->label->executed = 'executed'; $lang->action->label->importedcard = 'imported'; -$lang->action->label->importedplan = 'imported'; +$lang->action->label->importedproductplan = 'imported'; $lang->action->label->importedrelease = 'imported'; $lang->action->label->importedexecution = 'imported'; $lang->action->label->importedbuild = 'imported'; diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index 81b9633088..de29283f07 100755 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -194,7 +194,7 @@ $lang->action->desc->importfromgitlab = '$date, 由 $actor $lang->action->desc->archived = '$date, 由 $actor 归档。' . "\n"; $lang->action->desc->restore = '$date, 由 $actor 还原。' . "\n"; $lang->action->desc->importedcard = '$date, 由 $actor 从看板 $extra 导入。' . "\n"; -$lang->action->desc->importedplan = '$date, 由 $actor 从产品计划 $extra 导入。' . "\n"; +$lang->action->desc->importedproductplan = '$date, 由 $actor 从产品计划 $extra 导入。' . "\n"; $lang->action->desc->importedrelease = '$date, 由 $actor 从产品发布 $extra 导入。' . "\n"; $lang->action->desc->importedexecution = '$date, 由 $actor 从项目执行 $extra 导入。' . "\n"; $lang->action->desc->importedbuild = '$date, 由 $actor 从项目版本 $extra 导入。' . "\n"; @@ -338,7 +338,7 @@ $lang->action->label->activatedbychild = '激活了'; $lang->action->label->createchild = '激活了'; $lang->action->label->executed = '执行了'; $lang->action->label->importedcard = '导入了'; -$lang->action->label->importedplan = '导入了'; +$lang->action->label->importedproductplan = '导入了'; $lang->action->label->importedrelease = '导入了'; $lang->action->label->importedexecution = '导入了'; $lang->action->label->importedbuild = '导入了'; diff --git a/module/action/model.php b/module/action/model.php index a03924531c..67ca809d04 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -1053,6 +1053,13 @@ class actionModel extends model $user = $this->dao->select('id,realname')->from(TABLE_USER)->where('id')->eq($action->objectID)->fetch(); if($user) $action->objectName = $user->realname; } + elseif($action->objectType == 'kanbancard' and strpos($action->action, 'imported') !== false and $action->action != 'importedcard') + { + $objectType = str_replace('imported', '', $action->action); + $objectTable = zget($this->config->objectTables, $objectType); + $objectName = $objectType == 'productplan' ? 'title' : 'name'; + $action->objectName = $this->dao->select($objectName)->from($objectTable)->where('id')->eq($action->extra)->fetch($objectName); + } $projectID = isset($relatedProjects[$action->objectType][$action->objectID]) ? $relatedProjects[$action->objectType][$action->objectID] : 0; diff --git a/module/kanban/control.php b/module/kanban/control.php index 7e639f9cc8..6e7bd98a9f 100644 --- a/module/kanban/control.php +++ b/module/kanban/control.php @@ -863,7 +863,7 @@ class kanban extends control foreach($importedIDList as $cardID => $planID) { - $this->loadModel('action')->create('kanbancard', $cardID, 'importedPlan', '', $planID); + $this->loadModel('action')->create('kanbancard', $cardID, 'importedProductplan', '', $planID); } return print(js::locate($this->createLink('kanban', 'view', "kanbanID=$kanbanID"), 'parent.parent')); diff --git a/module/kanban/js/common.js b/module/kanban/js/common.js index fc66b36f5b..c9177e6d58 100644 --- a/module/kanban/js/common.js +++ b/module/kanban/js/common.js @@ -45,3 +45,26 @@ function initColorPicker() }) } +/** + * Reload object list. + * + * @param int $targetID + * @access public + * @return void + */ +function reloadObjectList(targetID) +{ + location.href = createLink('kanban', methodName, 'kanbanID=' + kanbanID + '®ionID=' + regionID + '&groupID=' + groupID + '&columnID=' + columnID + '&targetID=' + targetID); +} + +/** + * Set target lane ID. + * + * @param int $targetLaneID + * @access public + * @return void + */ +function setTargetLane(targetLaneID) +{ + $('#targetLane').val(targetLaneID); +} diff --git a/module/kanban/js/importbuild.js b/module/kanban/js/importbuild.js deleted file mode 100644 index d3ba2f1356..0000000000 --- a/module/kanban/js/importbuild.js +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Reload card list. - * - * @param int $kanbanID - * @access public - * @return void - */ -function reloadBuildList(targetID) -{ - location.href = createLink('kanban', 'importBuild','kanbanID=' + kanbanID + '®ionID=' + regionID + '&groupID=' + groupID + '&columnID=' + columnID + '&targetProductID=' + targetID); -} - -/** - * Set target lane ID. - * - * @param int $targetLaneID - * @access public - * @return void - */ -function setTargetLane(targetLaneID) -{ - $('#targetLane').val(targetLaneID); -} diff --git a/module/kanban/js/importcard.js b/module/kanban/js/importcard.js deleted file mode 100644 index e4acd67ed0..0000000000 --- a/module/kanban/js/importcard.js +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Reload card list. - * - * @param int $kanbanID - * @access public - * @return void - */ -function reloadCardList(targetID) -{ - location.href = createLink('kanban','importcard','kanbanID=' + kanbanID + '®ionID=' + regionID + '&groupID=' + groupID + '&columnID=' + columnID + '&targetKanbanID=' + targetID); -} - -/** - * Set target lane ID. - * - * @param int $targetLaneID - * @access public - * @return void - */ -function setTargetLane(targetLaneID) -{ - $('#targetLane').val(targetLaneID); -} diff --git a/module/kanban/js/importexecution.js b/module/kanban/js/importexecution.js deleted file mode 100644 index ef1a68892c..0000000000 --- a/module/kanban/js/importexecution.js +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Reload card list. - * - * @param int $kanbanID - * @access public - * @return void - */ -function reloadExecutionList(targetID) -{ - location.href = createLink('kanban', 'importExecution','kanbanID=' + kanbanID + '®ionID=' + regionID + '&groupID=' + groupID + '&columnID=' + columnID + '&targetProductID=' + targetID); -} - -/** - * Set target lane ID. - * - * @param int $targetLaneID - * @access public - * @return void - */ -function setTargetLane(targetLaneID) -{ - $('#targetLane').val(targetLaneID); -} diff --git a/module/kanban/js/importplan.js b/module/kanban/js/importplan.js deleted file mode 100644 index 51a7022b5e..0000000000 --- a/module/kanban/js/importplan.js +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Reload card list. - * - * @param int $kanbanID - * @access public - * @return void - */ -function reloadPlanList(targetID) -{ - location.href = createLink('kanban','importPlan','kanbanID=' + kanbanID + '®ionID=' + regionID + '&groupID=' + groupID + '&columnID=' + columnID + '&targetProductID=' + targetID); -} - -/** - * Set target lane ID. - * - * @param int $targetLaneID - * @access public - * @return void - */ -function setTargetLane(targetLaneID) -{ - $('#targetLane').val(targetLaneID); -} diff --git a/module/kanban/js/importrelease.js b/module/kanban/js/importrelease.js deleted file mode 100644 index c9341c4c02..0000000000 --- a/module/kanban/js/importrelease.js +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Reload card list. - * - * @param int $kanbanID - * @access public - * @return void - */ -function reloadReleaseList(targetID) -{ - location.href = createLink('kanban','importRelease','kanbanID=' + kanbanID + '®ionID=' + regionID + '&groupID=' + groupID + '&columnID=' + columnID + '&targetProductID=' + targetID); -} - -/** - * Set target lane ID. - * - * @param int $targetLaneID - * @access public - * @return void - */ -function setTargetLane(targetLaneID) -{ - $('#targetLane').val(targetLaneID); -} diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js index c94a4041b8..ea53cd8b1b 100644 --- a/module/kanban/js/view.js +++ b/module/kanban/js/view.js @@ -145,7 +145,7 @@ function renderHeaderCol($column, column, $header, kanbanData) if(columnPrivs.includes('createCard') && column.parent != -1) { - var cardUrl = createLink('kanban', 'importBuild', 'kanbanID=' + kanbanID + '®ionID=' + regionID + '&groupID=' + groupID + '&columnID=' + columnID); + var cardUrl = createLink('kanban', 'importplan', 'kanbanID=' + kanbanID + '®ionID=' + regionID + '&groupID=' + groupID + '&columnID=' + columnID); addItemBtn = ['', '', ''].join(''); } diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php index d3760d26de..ab7c709649 100644 --- a/module/kanban/lang/en.php +++ b/module/kanban/lang/en.php @@ -61,7 +61,7 @@ $lang->kanban->showClosed = 'Closed'; $lang->kanban->importCard = 'Import Card'; $lang->kanban->importPlan = 'Import Plan'; $lang->kanban->importRelease = 'Import Release'; -$lang->kanban->importExecution = 'Import Execution'; +$lang->kanban->importExecution = 'Import ' . $lang->execution->common; $lang->kanban->importBuild = 'Import Build'; $lang->kanban->allKanban = 'All Kanban'; $lang->kanban->allProjects = 'All Projects'; diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php index 87b8155d84..9c13c56213 100644 --- a/module/kanban/lang/zh-cn.php +++ b/module/kanban/lang/zh-cn.php @@ -61,7 +61,7 @@ $lang->kanban->showClosed = '显示已关闭'; $lang->kanban->importCard = '转入卡片'; $lang->kanban->importPlan = '导入产品计划'; $lang->kanban->importRelease = '导入产品发布'; -$lang->kanban->importExecution = '导入项目执行'; +$lang->kanban->importExecution = '导入项目' . $lang->execution->common; $lang->kanban->importBuild = '导入项目版本'; $lang->kanban->allKanban = '所有看板'; $lang->kanban->allProjects = '所有项目'; diff --git a/module/kanban/view/importbuild.html.php b/module/kanban/view/importbuild.html.php index e1da49c3e9..92a4c0237c 100644 --- a/module/kanban/view/importbuild.html.php +++ b/module/kanban/view/importbuild.html.php @@ -16,6 +16,7 @@ +app->rawMethod);?>
@@ -24,7 +25,7 @@

kanban->selectedProject;?>

-
+

kanban->selectedLane;?>

@@ -58,8 +59,8 @@ id);?> productName;?> - - project", $build->name, '', "class='iframe'", true, true);?> + + id", $build->name, '', "class='iframe'", true, true);?> name;?> diff --git a/module/kanban/view/importcard.html.php b/module/kanban/view/importcard.html.php index b07c298ebf..ebb099cc2b 100644 --- a/module/kanban/view/importcard.html.php +++ b/module/kanban/view/importcard.html.php @@ -16,6 +16,7 @@ +app->rawMethod);?>
@@ -24,7 +25,7 @@

kanban->selectedKanban;?>

-
+

kanban->selectedLane;?>

diff --git a/module/kanban/view/importexecution.html.php b/module/kanban/view/importexecution.html.php index 450ffb8fb4..519928107b 100644 --- a/module/kanban/view/importexecution.html.php +++ b/module/kanban/view/importexecution.html.php @@ -16,6 +16,7 @@ +app->rawMethod);?>
@@ -24,7 +25,7 @@

kanban->selectedProject;?>

-
+

kanban->selectedLane;?>

diff --git a/module/kanban/view/importplan.html.php b/module/kanban/view/importplan.html.php index ac0cab4109..b6ef413fa7 100644 --- a/module/kanban/view/importplan.html.php +++ b/module/kanban/view/importplan.html.php @@ -16,6 +16,7 @@ +app->rawMethod);?>
@@ -24,7 +25,7 @@

kanban->selectedProduct;?>

-
+

kanban->selectedLane;?>

diff --git a/module/kanban/view/importrelease.html.php b/module/kanban/view/importrelease.html.php index 32221c073a..e2c51ccc71 100644 --- a/module/kanban/view/importrelease.html.php +++ b/module/kanban/view/importrelease.html.php @@ -16,6 +16,7 @@ +app->rawMethod);?>
@@ -24,7 +25,7 @@

kanban->selectedProduct;?>

-
+

kanban->selectedLane;?>