diff --git a/module/common/view/kanban.html.php b/module/common/view/kanban.html.php
index 5b7b1cb01d..3fbe469153 100644
--- a/module/common/view/kanban.html.php
+++ b/module/common/view/kanban.html.php
@@ -429,8 +429,8 @@ $.extend($.fn.kanban.Constructor.DEFAULTS,
doingExecutionCount = $doingProjectItems.find('.execution-item').length;
}
- if(doingProjectCount > 0) $kanban.find('.kanban-header-col[data-type="doingProject"] > .title > .count').text(doingProjectCount);
- if(doingExecutionCount > 0) $kanban.find('.kanban-header-col[data-type="doingExecution"] > .title > .count').text(doingExecutionCount);
+ $kanban.find('.kanban-header-col[data-type="doingProject"] > .title > .count').text(doingProjectCount || 0);
+ $kanban.find('.kanban-header-col[data-type="doingExecution"] > .title > .count').text(doingExecutionCount || 0);
},
onCreate(kanban)
{
diff --git a/module/execution/control.php b/module/execution/control.php
index 460d390d38..4d8c69c81a 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1914,7 +1914,7 @@ class execution extends control
{
$this->loadModel('project');
$projects = $this->project->getPairsByProgram(0, 'noclosed');
- $executions = $this->project->getStats(0, 'all');
+ $executions = $this->project->getStats(0, 'all', 0, 0, 30, 'id_desc');
$teams = $this->dao->select('root,account')->from(TABLE_TEAM)
->where('root')->in($this->app->user->view->sprints)
@@ -1942,11 +1942,11 @@ class execution extends control
$statusCount[$status] += isset($kanbanGroup[$projectID][$status]) ? count($kanbanGroup[$projectID][$status]) : 0;
- /* Max 5 closed executions. */
+ /* Max 2 closed executions. */
if($status == 'closed')
{
- if(isset($myExecutions[$status]) and count($myExecutions[$status]) >= 5) $myExecutions[$status] = array_slice($myExecutions[$status], 0, 5, true);
- if(isset($kanbanGroup[$projectID][$status]) and count($kanbanGroup[$projectID][$status]) >= 5) $kanbanGroup[$projectID][$status] = array_slice($kanbanGroup[$projectID][$status], 0, 5, true);
+ if(isset($myExecutions[$status]) and count($myExecutions[$status]) >= 2) $myExecutions[$status] = array_slice($myExecutions[$status], 0, 2, true);
+ if(isset($kanbanGroup[$projectID][$status]) and count($kanbanGroup[$projectID][$status]) >= 2) $kanbanGroup[$projectID][$status] = array_slice($kanbanGroup[$projectID][$status], 0, 2, true);
}
}
diff --git a/module/project/model.php b/module/project/model.php
index ccf06ddc38..ce2d8e75e3 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1857,10 +1857,13 @@ class projectModel extends model
$myProjects = array();
$otherProjects = array();
+ $closedCount = 0;
foreach($projects as $project)
{
if(strpos('wait,doing,closed', $project->status) === false) continue;
+ if($project->status == 'closed') $closedCount ++;
+ if($closedCount > 2) continue;
$projectPath = explode(',', trim($project->path, ','));
$topProgram = !empty($project->parent) ? $projectPath[0] : $project->parent;