Merge branch 'sprint/182_liumengyi_fixbug' into 'kanban'

* Fix bug #18436.Finish task #47361.

See merge request easycorp/zentaopms!1400

module/block/control.php

@@ -905,7 +905,7 @@ class block extends control
 
         foreach($projects as $projectID => $project)
         {
-            if($project->model == 'scrum')
+            if($project->model == 'scrum' or $project->model == 'kanban')
             {
                 $this->app->loadClass('pager', $static = true);
                 $pager = pager::init(0, 3, 1);

module/block/view/projectstatisticblock.html.php

@@ -134,7 +134,7 @@ $(function()
       <?php foreach($projects as $project):?>
       <div class="tab-pane fade<?php if($project->id == $selected) echo ' active in';?>" id="tab3Content<?php echo $project->id;?>">
         <div class="table-row">
-          <?php if($project->model == 'scrum'):?>
+          <?php if($project->model == 'scrum' or $project->model == 'kanban'):?>
           <div class='table-row'>
             <div class="col-4 text-center">
               <div><h4><?php echo $lang->block->story;?></h4></div>

module/kanban/js/view.js

@@ -799,8 +799,8 @@ function initKanban($kanban)
         maxColHeight:      510,
         calcColHeight:     calcColHeight,
         fluidBoardWidth:   false,
-        minColWidth:       300,
-        maxColWidth:       300,
+        minColWidth:       287,
+        maxColWidth:       287,
         cardHeight:        60,
         displayCards:      window.displayCards || 2,
         createColumnText:  kanbanLang.createColumn,