From 7d2ab19bc4462a27fb05eb7edb903cf2f44dce18 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Tue, 17 May 2022 17:16:53 +0800 Subject: [PATCH] * Code format for task #54349. --- module/kanban/js/view.js | 2 +- module/kanban/model.php | 2 +- module/kanban/view/viewarchivedcard.html.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js index 3a214e9595..68bc081d9a 100644 --- a/module/kanban/js/view.js +++ b/module/kanban/js/view.js @@ -79,7 +79,7 @@ function exitFullScreen() { $('.region-actions > div > .action').show(); $(".title").attr("disabled", false).css("pointer-events", "auto"); - if(kanban.status == 'closed') return; + if(!CRKanban && kanban.status == 'closed') return; $('#kanbanContainer').removeClass('fullscreen') .off('scroll', tryUpdateKanbanAffix); $('.actions').show(); diff --git a/module/kanban/model.php b/module/kanban/model.php index dfba3b54a5..b81b8548f7 100644 --- a/module/kanban/model.php +++ b/module/kanban/model.php @@ -2940,7 +2940,7 @@ class kanbanModel extends model $actions .= "
"; $actions .= " {$this->lang->kanban->fullScreen}"; - $CRKanban = !($this->config->CRKanban === '0' and $kanban->status === 'closed'); + $CRKanban = !($this->config->CRKanban === '0' and $kanban->status === 'closed'); $printRegionBtn = ($CRKanban and (common::hasPriv('kanban', 'createRegion') or $printSetHeightBtn or common::hasPriv('kanban', 'performable') or common::hasPriv('kanban', 'enableArchived') or common::hasPriv('kanban', 'import') or common::hasPriv('kanban', 'setColumnWidth'))); $printKanbanBtn = (common::hasPriv('kanban', 'edit') or common::hasPriv('kanban', 'close') or common::hasPriv('kanban', 'delete')); diff --git a/module/kanban/view/viewarchivedcard.html.php b/module/kanban/view/viewarchivedcard.html.php index ebe2f900fc..eecd9de9b3 100644 --- a/module/kanban/view/viewarchivedcard.html.php +++ b/module/kanban/view/viewarchivedcard.html.php @@ -172,7 +172,7 @@ $app->loadLang('productplan');
performable) echo "id='performable'";?>> config->CRKanban or $kanban->status != 'closed'); + $CRKanban = ($this->config->CRKanban or $kanban->status != 'closed'); $canRestore = (commonModel::hasPriv('kanban', 'restoreCard') and $CRKanban); $canDelete = (commonModel::hasPriv('kanban', 'deleteCard') and $CRKanban);