From 18a386c06d825a0ca87faa81a8e142b47cd02a36 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Wed, 16 Mar 2022 16:10:52 +0800
Subject: [PATCH 1/3] * Fix bug #17734.

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

diff --git a/module/kanban/css/view.css b/module/kanban/css/view.css
index 3efd6ab6b7..b4608517a0 100644
--- a/module/kanban/css/view.css
+++ b/module/kanban/css/view.css
@@ -22,7 +22,7 @@
 .region .kanban-header-sub-cols .kanban-header-col > .title {max-width: 100% !important;min-width:240px;}
 .region .sort .region-header {cursor: move;}
 
-.region .kanban {padding: 0px 10px 10px 10px; min-height: unset; overflow:auto; width: 100%}
+.region .kanban {padding: 0px 5px 10px 10px; min-height: unset; overflow:auto; width: 100%}
 .region .kanban .form-actions {margin: 0;}
 .region .kanban .form-actions .btn {margin-right: 10px; min-width: 50px;}
 

From 050cefdbcd8b34d2443867d182336195a61f74da Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Wed, 16 Mar 2022 16:19:39 +0800
Subject: [PATCH 2/3] * Fix bug #20837.

---
 module/kanban/control.php                   | 6 +-----
 module/kanban/view/batchcreatecard.html.php | 1 +
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/module/kanban/control.php b/module/kanban/control.php
index 9347ff0380..5b4e54a957 100644
--- a/module/kanban/control.php
+++ b/module/kanban/control.php
@@ -830,13 +830,9 @@ class kanban extends control
         $kanbanUsers = $kanbanID == 0 ? ',' : trim($kanban->owner) . ',' . trim($kanban->team);
         $users       = $this->loadModel('user')->getPairs('noclosed|nodeleted', '', 0, $kanbanUsers);
 
-        $lanePairs = $this->kanban->getLanePairsByGroup($groupID);
-
-        $lanePairs['ditto'] = $this->lang->kanbancard->ditto;
-
         $this->view->title     = $this->lang->kanban->batchCreateCard;
         $this->view->users     = $users;
-        $this->view->lanePairs = $lanePairs;
+        $this->view->lanePairs = $this->kanban->getLanePairsByGroup($groupID);
 
         $this->display();
     }
diff --git a/module/kanban/view/batchcreatecard.html.php b/module/kanban/view/batchcreatecard.html.php
index e626473b17..42449a731f 100644
--- a/module/kanban/view/batchcreatecard.html.php
+++ b/module/kanban/view/batchcreatecard.html.php
@@ -39,6 +39,7 @@
           <tr>
             <td class='text-center'><?php echo $i + 1;?></td>
             <td class='text-center'><?php echo html::input("name[$i]", '', "class='form-control title-import'");?></td>
+            <?php if($i > 0) $lanePairs['ditto'] = $this->lang->kanbancard->ditto;?>
             <td style='overflow:visible'><?php echo html::select("lane[$i]", $lanePairs, key($lanePairs), "class='form-control chosen'")?></td>
             <td style='overflow:visible'><?php echo html::select("assignedTo[$i][]", $users, $app->user->account, "class='form-control chosen' multiple");?></td>
             <td><?php echo html::input("estimate[$i]", '', "class='form-control text-center'");?></td>

From 3e3cab4080e3a246b32b23955a9de1440251bfa8 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Wed, 16 Mar 2022 16:21:00 +0800
Subject: [PATCH 3/3] * Fix bug #20839.

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

diff --git a/module/kanban/view/batchcreatecard.html.php b/module/kanban/view/batchcreatecard.html.php
index 42449a731f..1fcc0cf70e 100644
--- a/module/kanban/view/batchcreatecard.html.php
+++ b/module/kanban/view/batchcreatecard.html.php
@@ -40,7 +40,7 @@
             <td class='text-center'><?php echo $i + 1;?></td>
             <td class='text-center'><?php echo html::input("name[$i]", '', "class='form-control title-import'");?></td>
             <?php if($i > 0) $lanePairs['ditto'] = $this->lang->kanbancard->ditto;?>
-            <td style='overflow:visible'><?php echo html::select("lane[$i]", $lanePairs, key($lanePairs), "class='form-control chosen'")?></td>
+            <td style='overflow:visible'><?php echo html::select("lane[$i]", $lanePairs, $i > 0 ? 'ditto' : key($lanePairs), "class='form-control chosen'")?></td>
             <td style='overflow:visible'><?php echo html::select("assignedTo[$i][]", $users, $app->user->account, "class='form-control chosen' multiple");?></td>
             <td><?php echo html::input("estimate[$i]", '', "class='form-control text-center'");?></td>
             <td>