diff --git a/module/custom/view/kanban.html.php b/module/custom/view/kanban.html.php index 2bd85af67b..787c1b1eea 100644 --- a/module/custom/view/kanban.html.php +++ b/module/custom/view/kanban.html.php @@ -16,7 +16,7 @@ custom->closedKanban;?> - CRKanban) ? $config->CRKanban : 0;?> + CRKanban) ? $config->CRKanban : 1;?> custom->CRKanban as $key => $value):?> diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 953c7b9aed..3df0680181 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -1270,6 +1270,7 @@ $lang->resource->custom->editStoryConcept = 'editStoryConcept'; $lang->resource->custom->browseStoryConcept = 'browseStoryConcept'; $lang->resource->custom->setDefaultConcept = 'setDefaultConcept'; $lang->resource->custom->deleteStoryConcept = 'deleteStoryConcept'; +$lang->resource->custom->kanban = 'kanban'; $lang->custom->methodOrder[5] = 'index'; $lang->custom->methodOrder[10] = 'set'; diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js index c3d5ff4403..3a214e9595 100644 --- a/module/kanban/js/view.js +++ b/module/kanban/js/view.js @@ -78,13 +78,13 @@ function fullScreen() function exitFullScreen() { $('.region-actions > div > .action').show(); + $(".title").attr("disabled", false).css("pointer-events", "auto"); if(kanban.status == 'closed') return; $('#kanbanContainer').removeClass('fullscreen') .off('scroll', tryUpdateKanbanAffix); $('.actions').show(); $('.action').show(); $('.kanban-group-header').show(); - $(".title").attr("disabled", false).css("pointer-events", "auto"); $('.kanban-col.kanban-header-col').css('padding', '0px 30px'); window.sortableDisabled = false; $.cookie('isFullScreen', 0); @@ -1417,6 +1417,7 @@ $(function() { fullScreen(); $('.region-actions > div > .action').show(); + $(".title").attr("disabled", false).css("pointer-events", "auto"); } }); diff --git a/module/kanban/model.php b/module/kanban/model.php index a9e6e2dc40..dfba3b54a5 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 or $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/viewcard.html.php b/module/kanban/view/viewcard.html.php index fe05b9f6fd..2f2c191868 100644 --- a/module/kanban/view/viewcard.html.php +++ b/module/kanban/view/viewcard.html.php @@ -34,7 +34,7 @@
- deleted and !$card->archived):?> + deleted and !$card->archived and !($this->config->CRKanban === '0' and $kanban->status === 'closed')):?> id", "{$lang->kanbancard->assign}", '', "class='btn btn-link iframe' title='{$lang->kanbancard->assign}'", true, true); if($kanban->archived)