Merge branch 'sprint/tianshujie_17734' into 'pailei2'

Sprint/tianshujie 17734

See merge request easycorp/zentaopms!2314

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();
     }

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;}
 

module/kanban/view/batchcreatecard.html.php

@@ -39,7 +39,8 @@
           <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>
-            <td style='overflow:visible'><?php echo html::select("lane[$i]", $lanePairs, key($lanePairs), "class='form-control chosen'")?></td>
+            <?php if($i > 0) $lanePairs['ditto'] = $this->lang->kanbancard->ditto;?>
+            <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>