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

* Optimize the code.

Browse Source
This commit is contained in:
xieqiyu
2022-01-24 12:07:16 +08:00
parent 895d345775
commit 8959feba2a
18 changed files with 50 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/lang/en.php
+2 -2
View File
@@ -194,7 +194,7 @@ $lang->action->desc->importfromgitlab = '$date, Issue associate created from
$lang->action->desc->archived = '$date, archived by <strong>$actor</strong>.' . "\n";
$lang->action->desc->restore = '$date, restore by <strong>$actor</strong>.' . "\n";
$lang->action->desc->importedcard = '$date, imported to <strong>$extra</strong> by <strong>$actor</strong>.' . "\n";
$lang->action->desc->importedplan = '$date, imported to <strong>$extra</strong> by <strong>$actor</strong>.' . "\n";
$lang->action->desc->importedproductplan = '$date, imported to <strong>$extra</strong> by <strong>$actor</strong>.' . "\n";
$lang->action->desc->importedrelease = '$date, imported to <strong>$extra</strong> by <strong>$actor</strong>.' . "\n";
$lang->action->desc->importedexecution = '$date, imported to <strong>$extra</strong> by <strong>$actor</strong>.' . "\n";
$lang->action->desc->importedbuild = '$date, imported to <strong>$extra</strong> by <strong>$actor</strong>.' . "\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';
module/action/lang/zh-cn.php
+2 -2
View File
@@ -194,7 +194,7 @@ $lang->action->desc->importfromgitlab = '$date, 由 <strong>$actor</strong>
$lang->action->desc->archived = '$date, 由 <strong>$actor</strong> 归档。' . "\n";
$lang->action->desc->restore = '$date, 由 <strong>$actor</strong> 还原。' . "\n";
$lang->action->desc->importedcard = '$date, 由 <strong>$actor</strong> 从看板 <strong>$extra</strong> 导入。' . "\n";
$lang->action->desc->importedplan = '$date, 由 <strong>$actor</strong> 从产品计划 <strong>$extra</strong> 导入。' . "\n";
$lang->action->desc->importedproductplan = '$date, 由 <strong>$actor</strong> 从产品计划 <strong>$extra</strong> 导入。' . "\n";
$lang->action->desc->importedrelease = '$date, 由 <strong>$actor</strong> 从产品发布 <strong>$extra</strong> 导入。' . "\n";
$lang->action->desc->importedexecution = '$date, 由 <strong>$actor</strong> 从项目执行 <strong>$extra</strong> 导入。' . "\n";
$lang->action->desc->importedbuild = '$date, 由 <strong>$actor</strong> 从项目版本 <strong>$extra</strong> 导入。' . "\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 = '导入了';
module/action/model.php
+7
View File
@@ -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;
module/kanban/control.php
+1 -1
View File
@@ -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'));
module/kanban/js/common.js
+23
View File
@@ -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 + '&regionID=' + regionID + '&groupID=' + groupID + '&columnID=' + columnID + '&targetID=' + targetID);
}
/**
* Set target lane ID.
*
* @param int $targetLaneID
* @access public
* @return void
*/
function setTargetLane(targetLaneID)
{
$('#targetLane').val(targetLaneID);
}
module/kanban/js/importbuild.js
-23
View File
@@ -1,23 +0,0 @@
/**
* Reload card list.
*
* @param int $kanbanID
* @access public
* @return void
*/
function reloadBuildList(targetID)
{
location.href = createLink('kanban', 'importBuild','kanbanID=' + kanbanID + '&regionID=' + regionID + '&groupID=' + groupID + '&columnID=' + columnID + '&targetProductID=' + targetID);
}
/**
* Set target lane ID.
*
* @param int $targetLaneID
* @access public
* @return void
*/
function setTargetLane(targetLaneID)
{
$('#targetLane').val(targetLaneID);
}
module/kanban/js/importcard.js
-23
View File
@@ -1,23 +0,0 @@
/**
* Reload card list.
*
* @param int $kanbanID
* @access public
* @return void
*/
function reloadCardList(targetID)
{
location.href = createLink('kanban','importcard','kanbanID=' + kanbanID + '&regionID=' + regionID + '&groupID=' + groupID + '&columnID=' + columnID + '&targetKanbanID=' + targetID);
}
/**
* Set target lane ID.
*
* @param int $targetLaneID
* @access public
* @return void
*/
function setTargetLane(targetLaneID)
{
$('#targetLane').val(targetLaneID);
}
module/kanban/js/importexecution.js
-23
View File
@@ -1,23 +0,0 @@
/**
* Reload card list.
*
* @param int $kanbanID
* @access public
* @return void
*/
function reloadExecutionList(targetID)
{
location.href = createLink('kanban', 'importExecution','kanbanID=' + kanbanID + '&regionID=' + regionID + '&groupID=' + groupID + '&columnID=' + columnID + '&targetProductID=' + targetID);
}
/**
* Set target lane ID.
*
* @param int $targetLaneID
* @access public
* @return void
*/
function setTargetLane(targetLaneID)
{
$('#targetLane').val(targetLaneID);
}
module/kanban/js/importplan.js
-23
View File
@@ -1,23 +0,0 @@
/**
* Reload card list.
*
* @param int $kanbanID
* @access public
* @return void
*/
function reloadPlanList(targetID)
{
location.href = createLink('kanban','importPlan','kanbanID=' + kanbanID + '&regionID=' + regionID + '&groupID=' + groupID + '&columnID=' + columnID + '&targetProductID=' + targetID);
}
/**
* Set target lane ID.
*
* @param int $targetLaneID
* @access public
* @return void
*/
function setTargetLane(targetLaneID)
{
$('#targetLane').val(targetLaneID);
}
module/kanban/js/importrelease.js
-23
View File
@@ -1,23 +0,0 @@
/**
* Reload card list.
*
* @param int $kanbanID
* @access public
* @return void
*/
function reloadReleaseList(targetID)
{
location.href = createLink('kanban','importRelease','kanbanID=' + kanbanID + '&regionID=' + regionID + '&groupID=' + groupID + '&columnID=' + columnID + '&targetProductID=' + targetID);
}
/**
* Set target lane ID.
*
* @param int $targetLaneID
* @access public
* @return void
*/
function setTargetLane(targetLaneID)
{
$('#targetLane').val(targetLaneID);
}
module/kanban/js/view.js
+1 -1
View File
@@ -145,7 +145,7 @@ function renderHeaderCol($column, column, $header, kanbanData)
if(columnPrivs.includes('createCard') && column.parent != -1)
{
var cardUrl = createLink('kanban', 'importBuild', 'kanbanID=' + kanbanID + '&regionID=' + regionID + '&groupID=' + groupID + '&columnID=' + columnID);
var cardUrl = createLink('kanban', 'importplan', 'kanbanID=' + kanbanID + '&regionID=' + regionID + '&groupID=' + groupID + '&columnID=' + columnID);
addItemBtn = ['<a data-contextmenu="columnCreate" data-toggle="modal" data-action="addItem" data-column="' + column.id + '" data-lane="' + laneID + '" href="' + cardUrl + '" class="text-primary iframe">', '<i class="icon icon-expand-alt"></i>', '</a>'].join('');
}
module/kanban/lang/en.php
+1 -1
View File
@@ -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';
module/kanban/lang/zh-cn.php
+1 -1
View File
@@ -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 = '所有项目';
module/kanban/view/importbuild.html.php
+4 -3
View File
@@ -16,6 +16,7 @@
<?php js::set('regionID', $regionID);?>
<?php js::set('groupID', $groupID);?>
<?php js::set('columnID', $columnID);?>
<?php js::set('methodName', $this->app->rawMethod);?>
<div id='mainContent' class='main-content'>
<div class='center-block'>
<div class='main-header'>
@@ -24,7 +25,7 @@
</div>
<div class='table-row' style="padding: 10px">
<div class='table-col w-150px text-center'><h4><?php echo $lang->kanban->selectedProject;?></h4></div>
<div class='table-col'><?php echo html::select('project', $projects, $selectedProjectID, "onchange='reloadBuildList(this.value)' class='form-control chosen'");?></div>
<div class='table-col'><?php echo html::select('project', $projects, $selectedProjectID, "onchange='reloadObjectList(this.value)' class='form-control chosen'");?></div>
</div>
<div class='table-row' style="padding: 10px">
<div class='table-col w-150px text-center'><h4><?php echo $lang->kanban->selectedLane;?></h4></div>
@@ -58,8 +59,8 @@
<?php printf('%03d', $build->id);?>
</td>
<td title='<?php echo $build->productName;?>'><?php echo $build->productName;?></td>
<?php if(common::hasPriv('project', 'build')):?>
<td title='<?php echo $build->name;?>'><?php common::printLink('project', 'build', "projectID=$build->project", $build->name, '', "class='iframe'", true, true);?></td>
<?php if(common::hasPriv('build', 'view')):?>
<td title='<?php echo $build->name;?>'><?php common::printLink('build', 'view', "buildID=$build->id", $build->name, '', "class='iframe'", true, true);?></td>
<?php else:?>
<td title='<?php echo $build->name;?>'><?php echo $build->name;?></td>
<?php endif;?>
module/kanban/view/importcard.html.php
+2 -1
View File
@@ -16,6 +16,7 @@
<?php js::set('regionID', $regionID);?>
<?php js::set('groupID', $groupID);?>
<?php js::set('columnID', $columnID);?>
<?php js::set('methodName', $this->app->rawMethod);?>
<div id='mainContent' class='main-content'>
<div class='center-block'>
<div class='main-header'>
@@ -24,7 +25,7 @@
</div>
<div class='table-row' style="padding: 10px">
<div class='table-col w-150px text-center'><h4><?php echo $lang->kanban->selectedKanban;?></h4></div>
<div class='table-col'><?php echo html::select('kanban', $kanbanPairs, $selectedKanbanID, "onchange='reloadCardList(this.value)' class='form-control chosen'");?></div>
<div class='table-col'><?php echo html::select('kanban', $kanbanPairs, $selectedKanbanID, "onchange='reloadObjectList(this.value)' class='form-control chosen'");?></div>
</div>
<div class='table-row' style="padding: 10px">
<div class='table-col w-150px text-center'><h4><?php echo $lang->kanban->selectedLane;?></h4></div>
module/kanban/view/importexecution.html.php
+2 -1
View File
@@ -16,6 +16,7 @@
<?php js::set('regionID', $regionID);?>
<?php js::set('groupID', $groupID);?>
<?php js::set('columnID', $columnID);?>
<?php js::set('methodName', $this->app->rawMethod);?>
<div id='mainContent' class='main-content'>
<div class='center-block'>
<div class='main-header'>
@@ -24,7 +25,7 @@
</div>
<div class='table-row' style="padding: 10px">
<div class='table-col w-150px text-center'><h4><?php echo $lang->kanban->selectedProject;?></h4></div>
<div class='table-col'><?php echo html::select('project', $projects, $selectedProjectID, "onchange='reloadExecutionList(this.value)' class='form-control chosen'");?></div>
<div class='table-col'><?php echo html::select('project', $projects, $selectedProjectID, "onchange='reloadObjectList(this.value)' class='form-control chosen'");?></div>
</div>
<div class='table-row' style="padding: 10px">
<div class='table-col w-150px text-center'><h4><?php echo $lang->kanban->selectedLane;?></h4></div>
module/kanban/view/importplan.html.php
+2 -1
View File
@@ -16,6 +16,7 @@
<?php js::set('regionID', $regionID);?>
<?php js::set('groupID', $groupID);?>
<?php js::set('columnID', $columnID);?>
<?php js::set('methodName', $this->app->rawMethod);?>
<div id='mainContent' class='main-content'>
<div class='center-block'>
<div class='main-header'>
@@ -24,7 +25,7 @@
</div>
<div class='table-row' style="padding: 10px">
<div class='table-col w-150px text-center'><h4><?php echo $lang->kanban->selectedProduct;?></h4></div>
<div class='table-col'><?php echo html::select('product', $products, $selectedProductID, "onchange='reloadPlanList(this.value)' class='form-control chosen'");?></div>
<div class='table-col'><?php echo html::select('product', $products, $selectedProductID, "onchange='reloadObjectList(this.value)' class='form-control chosen'");?></div>
</div>
<div class='table-row' style="padding: 10px">
<div class='table-col w-150px text-center'><h4><?php echo $lang->kanban->selectedLane;?></h4></div>
module/kanban/view/importrelease.html.php
+2 -1
View File
@@ -16,6 +16,7 @@
<?php js::set('regionID', $regionID);?>
<?php js::set('groupID', $groupID);?>
<?php js::set('columnID', $columnID);?>
<?php js::set('methodName', $this->app->rawMethod);?>
<div id='mainContent' class='main-content'>
<div class='center-block'>
<div class='main-header'>
@@ -24,7 +25,7 @@
</div>
<div class='table-row' style="padding: 10px">
<div class='table-col w-150px text-center'><h4><?php echo $lang->kanban->selectedProduct;?></h4></div>
<div class='table-col'><?php echo html::select('product', $products, $selectedProductID, "onchange='reloadReleaseList(this.value)' class='form-control chosen'");?></div>
<div class='table-col'><?php echo html::select('product', $products, $selectedProductID, "onchange='reloadObjectList(this.value)' class='form-control chosen'");?></div>
</div>
<div class='table-row' style="padding: 10px">
<div class='table-col w-150px text-center'><h4><?php echo $lang->kanban->selectedLane;?></h4></div>