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

* Adjust the variable name.

Browse Source
This commit is contained in:
hufangzhou
2021-11-01 14:11:21 +08:00
parent 702c40addd
commit f0349dac2c
4 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/js/kanban.js
+7 -5
View File
@@ -537,14 +537,16 @@ function createLaneMenu(options)
var $kanban = $lane.closest('.kanban');
var lane = $lane.data('lane');
var kanbanID = options.kanban;
var upTargetKanban = !$kanban.prev('.kanban').length ? '' : $kanban.prev('.kanban').data('id');
var downTargetKanban = !$kanban.next('.kanban').length ? '' : $kanban.next('.kanban').data('id');
var upTargetKanban = $kanban.prev('.kanban').length ? $kanban.prev('.kanban').data('id') : '';
var downTargetKanban = $kanban.next('.kanban').length ? $kanban.next('.kanban').data('id') : '';
var items = [];
if(priv.hasSetLane) items.push({label: setLaneLang, icon: 'edit', url: $.createLink('kanban', 'setLane', 'lane=' + lane.id + '&executionID=' + executionID), className: 'iframe'});
if(priv.hasSetLane) items.push({label: kanbanLang.setLane, icon: 'edit', url: $.createLink('kanban', 'setLane', 'lane=' + lane.id + '&executionID=' + executionID), className: 'iframe'});
if(priv.hasLaneMove) items.push(
{label: moveUpLang, icon: 'arrow-up', url: $.createLink('kanban', 'laneMove', 'executionID=' + executionID + '&currentLane=' + lane.id + '&targetLane=' + upTargetKanban), className: 'iframe', disabled: !$kanban.prev('.kanban').length},
{label: moveDownLang, icon: 'arrow-down', url: $.createLink('kanban', 'laneMove', 'executionID=' + executionID + '&currentLane=' + lane.id + '&targetLane=' + downTargetKanban), className: 'iframe', disabled: !$kanban.next('.kanban').length}
{label: kanbanLang.moveUp, icon: 'arrow-up', url: $.createLink('kanban', 'laneMove', 'executionID=' + executionID + '&currentLane=' + lane.id + '&targetLane=' + upTargetKanban), className: 'iframe', disabled: !$kanban.prev('.kanban').length},
{label: kanbanLang.moveDown, icon: 'arrow-down', url: $.createLink('kanban', 'laneMove', 'executionID=' + executionID + '&currentLane=' + lane.id + '&targetLane=' + downTargetKanban), className: 'iframe', disabled: !$kanban.next('.kanban').length}
);
var bounds = options.$trigger[0].getBoundingClientRect();
items.$options = {x: bounds.right, y: bounds.top};
return items;
module/execution/view/kanban.html.php
+1 -3
View File
@@ -142,7 +142,5 @@ js::set('priv',
<?php js::set('editName', $lang->execution->editName);?>
<?php js::set('setWIP', $lang->execution->setWIP);?>
<?php js::set('sortColumn', $lang->execution->sortColumn);?>
<?php js::set('setLaneLang', $lang->kanban->setLane);?>
<?php js::set('moveUpLang', $lang->kanban->moveUp);?>
<?php js::set('moveDownLang', $lang->kanban->moveDown);?>
<?php js::set('kanbanLang', $lang->kanban);?>
<?php include '../../common/view/footer.html.php';?>
module/kanban/control.php
+5 -5
View File
@@ -157,16 +157,16 @@ class kanban extends control
* Change the order through the lane move up and down.
*
* @param int $executionID
* @param string $currentLane
* @param string $targetLane
* @param string $currentType
* @param string $targetType
* @access public
* @return void
*/
public function laneMove($executionID, $currentLane, $targetLane)
public function laneMove($executionID, $currentType, $targetType)
{
if(empty($targetLane)) return false;
if(empty($targetType)) return false;
$this->kanban->updateLaneOrder($executionID, $currentLane, $targetLane);
$this->kanban->updateLaneOrder($executionID, $currentType, $targetType);
die(js::locate($this->createLink('execution', 'kanban', 'executionID=' . $executionID . '&type=all'), 'parent'));
}
module/kanban/model.php
+8 -8
View File
@@ -611,24 +611,24 @@ class kanbanModel extends model
* Change the order through the lane move up and down.
*
* @param int $executionID
* @param string $currentLane
* @param string $targetLane
* @param string $currentType
* @param string $targetType
* @access public
* @return void
*/
public function updateLaneOrder($executionID, $currentLane, $targetLane)
public function updateLaneOrder($executionID, $currentType, $targetType)
{
$orderList = $this->dao->select('id,type,`order`')->from(TABLE_KANBANLANE)
->where('execution')->eq($executionID)
->andWhere('type')->in(array($currentLane, $targetLane))
->andWhere('type')->in(array($currentType, $targetType))
->fetchAll('type');
$this->dao->update(TABLE_KANBANLANE)->set('`order`')->eq($orderList[$targetLane]->order)
->where('id')->eq($orderList[$currentLane]->id)
$this->dao->update(TABLE_KANBANLANE)->set('`order`')->eq($orderList[$targetType]->order)
->where('id')->eq($orderList[$currentType]->id)
->exec();
$this->dao->update(TABLE_KANBANLANE)->set('`order`')->eq($orderList[$currentLane]->order)
->where('id')->eq($orderList[$targetLane]->id)
$this->dao->update(TABLE_KANBANLANE)->set('`order`')->eq($orderList[$currentType]->order)
->where('id')->eq($orderList[$targetType]->id)
->exec();
}