From 6992338a0e264eaf73b7a6ac06e73760c6e39cc6 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Fri, 14 Jan 2022 10:46:54 +0800
Subject: [PATCH] * Finish task #47358.

---
 module/kanban/css/view.css |  2 +-
 module/kanban/js/view.js   | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/module/kanban/css/view.css b/module/kanban/css/view.css
index 9f4463af97..b2e9f50509 100644
--- a/module/kanban/css/view.css
+++ b/module/kanban/css/view.css
@@ -83,7 +83,7 @@
 .region .kanban-item .has-color .info > .label-pri {border-color: #FFFFFF;}
 .region .kanban-item .item-more {position: absolute; right: 6px; top: 0px;}
 
-.kanban-card {height: auto !important; padding: 8px 14px !important}
+.kanban-card {height: auto !important; padding: 8px 14px !important; min-height: 60px;}
 .kanban-card > .title {word-break: break-all;}
 .kanban-card > .info {position: relative; margin-top: 5px}
 .kanban-card > .info > .info + .info {margin-left: 8px}
diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js
index 8a54b42177..3eb511ae68 100644
--- a/module/kanban/js/view.js
+++ b/module/kanban/js/view.js
@@ -770,7 +770,9 @@ function calcColHeight(col, lane, colCards, colHeight, kanban)
 {
     if(!isMultiLanes) return 0;
 
-    var options      = kanban.options;
+    var options = kanban.options;
+
+    if(!options.displayCards) return 0;
     var displayCards = +(options.displayCards || 2);
 
     if (typeof displayCards !== 'number' || displayCards < 2) displayCards = 2;
@@ -790,8 +792,9 @@ window.menuCreators =
  */
 function initKanban($kanban)
 {
-    var id = $kanban.data('id');
-    var region = regions[id];
+    var id           = $kanban.data('id');
+    var region       = regions[id];
+    var displayCards = window.displayCards == 'undefined' ? 2 : window.displayCards;
 
     $kanban.kanban(
     {
@@ -802,7 +805,7 @@ function initKanban($kanban)
         minColWidth:       287,
         maxColWidth:       287,
         cardHeight:        60,
-        displayCards:      window.displayCards || 2,
+        displayCards:      displayCards,
         createColumnText:  kanbanLang.createColumn,
         addItemText:       '',
         itemRender:        renderKanbanItem,
@@ -833,7 +836,7 @@ $(function()
 {
     if($.cookie('isFullScreen') == 1) fullScreen();
 
-    window.isMultiLanes = $('#kanban .kanban').length > 1 || $('#kanban .kanban-lane').length > 1;
+    window.isMultiLanes = laneCount > 1;
 
     /* Init first kanban */
     $('.kanban').each(function()