diff --git a/module/bug/model.php b/module/bug/model.php index e2f6587558..75c34e87f2 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -1574,6 +1574,7 @@ class bugModel extends model ->leftJoin(TABLE_PRODUCT)->alias('t2') ->on('t1.product=t2.id') ->where('t1.assignedTo')->eq($account) + ->andWhere('t1.status')->ne('closed') ->beginIF(!empty($skipProductIDList))->andWhere('t1.product')->notin($skipProductIDList)->fi() ->beginIF(!empty($skipExecutionIDList))->andWhere('t1.execution')->notin($skipExecutionIDList)->fi() ->andWhere('t1.deleted')->eq(0) diff --git a/module/story/model.php b/module/story/model.php index d5eedc2706..5bc7690b74 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -3034,6 +3034,7 @@ class storyModel extends model return $this->dao->select('id, title') ->from(TABLE_STORY) ->where('deleted')->eq(0) + ->andWhere('status')->ne('closed') ->andWhere('type')->eq($type) ->andWhere('vision')->eq($this->config->vision) ->andWhere('assignedTo')->eq($account) diff --git a/module/task/model.php b/module/task/model.php index 18acf88775..e038af079d 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -2343,6 +2343,7 @@ class taskModel extends model ->leftjoin(TABLE_PROJECT)->alias('t2')->on('t1.execution = t2.id') ->where('t1.assignedTo')->eq($account) ->andWhere('t1.deleted')->eq(0) + ->andWhere('t1.status')->ne('closed') ->beginIF($this->config->vision)->andWhere('t1.vision')->eq($this->config->vision)->fi() ->beginIF($status != 'all')->andWhere('t1.status')->in($status)->fi() ->beginIF(!empty($skipExecutionIDList))->andWhere('t1.execution')->notin($skipExecutionIDList)->fi() diff --git a/module/testtask/model.php b/module/testtask/model.php index 76c13112a9..ea4012adf0 100644 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -1046,6 +1046,7 @@ class testtaskModel extends model ->from(TABLE_TESTTASK)->alias('t1') ->leftjoin(TABLE_EXTENSION)->alias('t2')->on('t1.execution = t2.id') ->where('t1.owner')->eq($account) + ->andWhere('t1.status')->ne('done') ->andWhere('t1.deleted')->eq(0) ->beginIF($status != 'all')->andWhere('t1.status')->in($status)->fi() ->beginIF(!empty($skipProductIDList))->andWhere('t1.product')->notin($skipProductIDList)->fi()