Merge branch 'sprint/sunhao/fix_kanban_fullscreen'

module/execution/js/kanban.js

@@ -1243,7 +1243,8 @@ function initKanban($kanban)
         onRenderCount:     renderCount,
         droppable:         {target: findDropColumns, finish:handleFinishDrop},
         virtualize:        true,
-        virtualCardList:   true
+        virtualCardList:   true,
+        virtualRenderOptions: {container: $(window).add($('#kanbanContainer'))}
     });
 
     $kanban.on('click', '.action-cancel', hideKanbanAction);

module/execution/js/taskkanban.js

@@ -1062,7 +1062,7 @@ $(function()
         cardsPerRow:          window.kanbanScaleSize,
         virtualize:           true,
         onAction:             handleKanbanAction,
-        virtualRenderOptions: {container: '#kanbanContainer>.panel-body'},
+        virtualRenderOptions: {container: '#kanbanContainer>.panel-body,#kanbanContainer'},
         virtualCardList:      true,
         droppable:
         {
@@ -1071,7 +1071,7 @@ $(function()
         },
         onRenderHeaderCol: renderHeaderCol,
         onRenderLaneName:  renderLaneName,
-        onRenderCount:     renderColumnCount
+        onRenderCount:     renderColumnCount,
     };
 
     /* Create kanban */

module/execution/view/edit.html.php

@@ -25,11 +25,15 @@
     </div>
     <form class='load-indicator main-form form-ajax' method='post' target='hiddenwin' id='dataform'>
       <table class='table table-form'>
-        <?php if($config->systemMode == 'new' and isset($project) and $project->model == 'scrum'):?>
+        <?php if($config->systemMode == 'new' and isset($project)):?>
+        <?php if($project->model == 'scrum'):?>
         <tr>
           <th class='w-120px'><?php echo $lang->execution->projectName;?></th>
           <td><?php echo html::select('project', $allProjects, $execution->project, "class='form-control chosen' onchange='changeProject(this.value)' required");?></td><td></td>
         </tr>
+        <?php elseif($project->model == 'kanban'):?>
+        <?php echo html::hidden('project', $project->id);?>
+        <?php endif;?>
         <?php endif;?>
         <tr>
           <th class='w-120px'><?php echo $lang->execution->name;?></th>

module/kanban/js/view.js

@@ -1269,25 +1269,26 @@ function initKanban($kanban)
 
     $kanban.kanban(
     {
-        data:              region.groups,
-        maxColHeight:      510,
-        calcColHeight:     calcColHeight,
-        fluidBoardWidth:   fluidBoard,
-        minColWidth:       285,
-        maxColWidth:       285,
-        cardHeight:        60,
-        displayCards:      displayCards,
-        createColumnText:  kanbanLang.createColumn,
-        addItemText:       '',
-        itemRender:        renderKanbanItem,
-        onAction:          handleKanbanAction,
-        onRenderKanban:    adjustAddBtnPosition,
-        onRenderLaneName:  renderLaneName,
-        onRenderHeaderCol: renderHeaderCol,
-        onRenderCount:     renderCount,
-        sortable:          handleSortCards,
-        virtualize:        true,
-        virtualCardList:   true,
+        data:                  region.groups,
+        maxColHeight:          510,
+        calcColHeight:         calcColHeight,
+        fluidBoardWidth:       fluidBoard,
+        minColWidth:           285,
+        maxColWidth:           285,
+        cardHeight:            60,
+        displayCards:          displayCards,
+        createColumnText:      kanbanLang.createColumn,
+        addItemText:           '',
+        itemRender:            renderKanbanItem,
+        onAction:              handleKanbanAction,
+        onRenderKanban:        adjustAddBtnPosition,
+        onRenderLaneName:      renderLaneName,
+        onRenderHeaderCol:     renderHeaderCol,
+        onRenderCount:         renderCount,
+        sortable:              handleSortCards,
+        virtualize:            true,
+        virtualRenderOptions:  {container: $(window).add($('#kanbanContainer'))},
+        virtualCardList:       true,
         droppable:
         {
             target:       findDropColumns,