From e2ca7b2dca60d0f2885dc3b95cd5bf62adea4865 Mon Sep 17 00:00:00 2001 From: "wenjie@cnezsoft.com" Date: Sun, 1 May 2011 03:28:46 +0000 Subject: [PATCH] * change code about undone --- module/task/control.php | 2 +- module/task/model.php | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/module/task/control.php b/module/task/control.php index 030fc64ccd..88331d64ec 100644 --- a/module/task/control.php +++ b/module/task/control.php @@ -492,7 +492,7 @@ class task extends control * @access public * @return void */ - public function report($projectID, $browseType) + public function report($projectID, $browseType = 'all') { $this->loadModel('report'); diff --git a/module/task/model.php b/module/task/model.php index 54b13331c3..ff13c131cc 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -692,11 +692,10 @@ class taskModel extends model $datas = $this->dao->select('finishedBy AS name, COUNT(finishedBy) AS value') ->from(TABLE_TASK)->alias('t1') ->where($this->session->taskReportCondition) + ->andWhere('finishedBy')->ne('') ->groupBy('finishedBy') ->orderBy('value DESC') ->fetchAll('name'); - if(!$datas) return array(); - foreach($datas as $key => $data) $data->name = $data->name ? $data->name : $this->lang->task->statusList['undone']; return $datas; }