From 3d34eb42e868b50d7049ec33dd3c75bebe840d05 Mon Sep 17 00:00:00 2001 From: Yagami Date: Sat, 29 Dec 2018 13:41:36 +0800 Subject: [PATCH 1/2] * Finish task #5190. --- module/block/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/block/model.php b/module/block/model.php index ea26ca8e64..25b75d32b2 100644 --- a/module/block/model.php +++ b/module/block/model.php @@ -157,7 +157,7 @@ class blockModel extends model { $data = array(); - $data['tasks'] = (int)$this->dao->select('count(*) AS count')->from(TABLE_TASK)->where('assignedTo')->eq($this->app->user->account)->andWhere('deleted')->eq(0)->fetch('count'); + $data['tasks'] = (int)$this->dao->select('count(*) AS count')->from(TABLE_TASK)->where('assignedTo')->eq($this->app->user->account)->andWhere('deleted')->eq(0)->andWhere('status')->ne('closed')->fetch('count'); $data['bugs'] = (int)$this->dao->select('count(*) AS count')->from(TABLE_BUG)->where('assignedTo')->eq($this->app->user->account)->andWhere('deleted')->eq(0)->fetch('count'); $data['stories'] = (int)$this->dao->select('count(*) AS count')->from(TABLE_STORY)->where('assignedTo')->eq($this->app->user->account)->andWhere('deleted')->eq(0)->fetch('count'); $data['projects'] = (int)$this->dao->select('count(*) AS count')->from(TABLE_PROJECT) From 3d850bdc0a111831be9d173ff4bf5e74716857c4 Mon Sep 17 00:00:00 2001 From: Yagami Date: Sat, 29 Dec 2018 13:43:29 +0800 Subject: [PATCH 2/2] * Fix task 5190. --- module/block/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/block/model.php b/module/block/model.php index 25b75d32b2..222ca80d9d 100644 --- a/module/block/model.php +++ b/module/block/model.php @@ -157,7 +157,7 @@ class blockModel extends model { $data = array(); - $data['tasks'] = (int)$this->dao->select('count(*) AS count')->from(TABLE_TASK)->where('assignedTo')->eq($this->app->user->account)->andWhere('deleted')->eq(0)->andWhere('status')->ne('closed')->fetch('count'); + $data['tasks'] = (int)$this->dao->select('count(*) AS count')->from(TABLE_TASK)->where('assignedTo')->eq($this->app->user->account)->andWhere('status')->ne('closed')->andWhere('deleted')->eq(0)->fetch('count'); $data['bugs'] = (int)$this->dao->select('count(*) AS count')->from(TABLE_BUG)->where('assignedTo')->eq($this->app->user->account)->andWhere('deleted')->eq(0)->fetch('count'); $data['stories'] = (int)$this->dao->select('count(*) AS count')->from(TABLE_STORY)->where('assignedTo')->eq($this->app->user->account)->andWhere('deleted')->eq(0)->fetch('count'); $data['projects'] = (int)$this->dao->select('count(*) AS count')->from(TABLE_PROJECT)