From 87c12c800af92dfe4e78ef8c7442aa2d544b1c4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= Date: Fri, 17 Dec 2021 15:43:19 +0800 Subject: [PATCH] * Fix code details. --- module/execution/js/kanban.js | 4 ++-- module/execution/view/kanban.html.php | 2 +- module/kanban/control.php | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js index 6806b46d68..e7eeac6b8c 100644 --- a/module/execution/js/kanban.js +++ b/module/execution/js/kanban.js @@ -527,8 +527,8 @@ function findDropColumns($element, $root) function changeCardColType(card, fromColType, toColType, kanbanID) { if(typeof card == 'undefined') return false; - var objectID = card.id; - var showIframe = false; + var objectID = card.id; + var showIframe = false; /* Task lane. */ if(kanbanID == 'task') diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php index e31c0fef02..63ec6c7f6d 100644 --- a/module/execution/view/kanban.html.php +++ b/module/execution/view/kanban.html.php @@ -155,7 +155,7 @@ js::set('priv', 'canCloseTask' => common::hasPriv('task', 'close'), 'canActivateTask' => common::hasPriv('task', 'activate'), 'canStartTask' => common::hasPriv('task', 'start'), - 'canConfirmBug' => common::hasPriv('bug', 'confirm') + 'canConfirmBug' => common::hasPriv('bug', 'confirmBug') ) ); ?> diff --git a/module/kanban/control.php b/module/kanban/control.php index fdb8d18a3a..5460a19129 100644 --- a/module/kanban/control.php +++ b/module/kanban/control.php @@ -722,9 +722,9 @@ class kanban extends control * @param string $browseType * @param string $browseType * @access public - * @return void + * @return json */ - public function ajaxMoveCard($cardID, $fromColID, $toColType = 'ready', $executionID, $browseType, $groupBy) + public function ajaxMoveCard($cardID = 0, $fromColID = 0, $toColType = 'ready', $executionID = 0, $browseType = 'all', $groupBy = '') { $fromColumn = $this->dao->select('*')->from(TABLE_KANBANCOLUMN)->where('id')->eq($fromColID)->fetch(); $toColumn = $this->dao->select('*')->from(TABLE_KANBANCOLUMN)->where('type')->eq($toColType)->andWhere('lane')->eq($fromColumn->lane)->fetch();