From 3509477e6bf77944928847730c0ba75042f320d0 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Fri, 2 Sep 2022 13:44:45 +0800
Subject: [PATCH 1/2] * Fix bug #27238, and fix bug for set switcher.

---
 module/kanban/control.php                     |  3 +++
 module/kanban/js/view.js                      |  6 ++++--
 module/kanban/view/ajaxgetkanbanmenu.html.php | 16 ++++++++--------
 module/kanban/view/view.html.php              |  4 ++--
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/module/kanban/control.php b/module/kanban/control.php
index 1cdb2f9d00..ceefd81560 100644
--- a/module/kanban/control.php
+++ b/module/kanban/control.php
@@ -23,6 +23,8 @@ class kanban extends control
      */
     public function space($browseType = 'involved', $recTotal = 0, $recPerPage = 15, $pageID = 1)
     {
+        $this->session->set('regionID', 'all', 'kanban');
+
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
         $pager = new pager($recTotal, $recPerPage, $pageID);
@@ -421,6 +423,7 @@ class kanban extends control
         }
 
         $regions = $this->kanban->getKanbanData($kanbanID);
+        if(!isset($regions[$regionID])) $this->session->set('regionID', 'all', 'kanban');
 
         $this->view->users    = $users;
         $this->view->title    = $this->lang->kanban->view;
diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js
index 9d9012e572..3cfe027725 100644
--- a/module/kanban/js/view.js
+++ b/module/kanban/js/view.js
@@ -13,8 +13,10 @@ function loadMore(type, regionID)
     var link     = createLink('kanban', method, 'regionID=' + regionID);
     $(selector).load(link, function()
     {
-        var windowHeight = $(window).height();
-        $(selector + ' .panel-body').css('height', windowHeight - 100);
+        var windowHeight  = $(window).height();
+        var affixedHeight = $('#regionTabs.affixed').height() + $('#kanbanContainer .kanban-affixed .kanban-cols').height();
+        $(selector + ' .panel-body').css('height', windowHeight - affixedHeight);
+        $(selector).css('top', $('#regionTabs.affixed').height() + $('#kanbanContainer .kanban-affixed .kanban-cols').height());
         $(selector).animate({right: 0}, 500);
     });
 }
diff --git a/module/kanban/view/ajaxgetkanbanmenu.html.php b/module/kanban/view/ajaxgetkanbanmenu.html.php
index 7e79f5fefa..2c3c1faed4 100644
--- a/module/kanban/view/ajaxgetkanbanmenu.html.php
+++ b/module/kanban/view/ajaxgetkanbanmenu.html.php
@@ -136,10 +136,10 @@ $closedKanbansHtml .= '</ul>';
 <script>
 $(function()
 {
-    $('.nav-tabs li span').hide();
-    $('.nav-tabs li.active').find('span').show();
+    $('#dropMenu .nav-tabs li span').hide();
+    $('#dropMenu .nav-tabs li.active').find('span').show();
 
-    $('.nav-tabs>li a').click(function()
+    $('#dropMenu .nav-tabs>li a').click(function()
     {
         if($('#swapper input[type="search"]').val() == '')
         {
@@ -154,14 +154,14 @@ $(function()
     {
         if(value != '')
         {
-            $('div.hide-in-search').siblings('i').addClass('hide-in-search');
-            $('.nav-tabs li span').hide();
+            $('#dropMenu div.hide-in-search').siblings('i').addClass('hide-in-search');
+            $('#dropMenu .nav-tabs li span').hide();
         }
         else
         {
-            $('div.hide-in-search').siblings('i').removeClass('hide-in-search');
-            $('li.has-list div.hide-in-search').removeClass('hidden');
-            $('.nav-tabs li.active').find('span').show();
+            $('#dropMenu div.hide-in-search').siblings('i').removeClass('hide-in-search');
+            $('#dropMenu li.has-list div.hide-in-search').removeClass('hidden');
+            $('#dropMenu .nav-tabs li.active').find('span').show();
         }
     })
 })
diff --git a/module/kanban/view/view.html.php b/module/kanban/view/view.html.php
index 915bb3ba12..d3208c74dd 100644
--- a/module/kanban/view/view.html.php
+++ b/module/kanban/view/view.html.php
@@ -111,8 +111,8 @@ $canViewArchivedColumn = commonModel::hasPriv('kanban', 'viewArchivedColumn');
                 <?php if($canCreateLane)   echo '<li>' . html::a(inlink('createLane', "kanbanID={$kanban->id}&regionID={$region->id}", '', 1), '<i class="icon icon-plus"></i>' . $this->lang->kanban->createLane, '', "class='iframe'") . '</li>';?>
                 <?php if($canDeleteRegion and count($regions) > 1) echo '<li>' . html::a(inlink('deleteRegion', "regionID={$region->id}"), '<i class="icon icon-trash"></i>' . $this->lang->kanban->deleteRegion, "hiddenwin") . '</li>';?>
                 <?php if(($canCreateRegion or $canEditRegion or $canCreateLane or ($canDeleteRegion and count($regions) > 1)) and ($kanban->archived and ($canViewArchivedCard or $canViewArchivedColumn)))echo "<li class='divider'></li>"?>
-                <?php if($canViewArchivedCard and $kanban->archived) echo '<li>' . html::a("javascript:loadMore(\"Card\", $regionID)", '<i class="icon icon-card-archive"></i>' . $this->lang->kanban->viewArchivedCard) . '</li>';?>
-                <?php if($canViewArchivedColumn and $kanban->archived) echo '<li>' . html::a("javascript:loadMore(\"Column\", $regionID)", '<i class="icon icon-col-archive"></i>' . $this->lang->kanban->viewArchivedColumn) . '</li>';?>
+                <?php if($canViewArchivedCard and $kanban->archived) echo '<li>' . html::a("javascript:loadMore(\"Card\", $region->id)", '<i class="icon icon-card-archive"></i>' . $this->lang->kanban->viewArchivedCard) . '</li>';?>
+                <?php if($canViewArchivedColumn and $kanban->archived) echo '<li>' . html::a("javascript:loadMore(\"Column\", $region->id)", '<i class="icon icon-col-archive"></i>' . $this->lang->kanban->viewArchivedColumn) . '</li>';?>
               </ul>
               <?php endif;?>
             </div>

From c5e91ea1204e2cf828b641e466cffbc4ad8c8ed1 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Fri, 2 Sep 2022 13:48:24 +0800
Subject: [PATCH 2/2] * Optimize code for bug #27238.

---
 module/kanban/js/view.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js
index 3cfe027725..deae240217 100644
--- a/module/kanban/js/view.js
+++ b/module/kanban/js/view.js
@@ -16,7 +16,7 @@ function loadMore(type, regionID)
         var windowHeight  = $(window).height();
         var affixedHeight = $('#regionTabs.affixed').height() + $('#kanbanContainer .kanban-affixed .kanban-cols').height();
         $(selector + ' .panel-body').css('height', windowHeight - affixedHeight);
-        $(selector).css('top', $('#regionTabs.affixed').height() + $('#kanbanContainer .kanban-affixed .kanban-cols').height());
+        $(selector).css('top', affixedHeight);
         $(selector).animate({right: 0}, 500);
     });
 }