diff options
Diffstat (limited to 'h-source/Application/Controllers')
| -rw-r--r-- | h-source/Application/Controllers/GenericController.php | 2 | ||||
| -rw-r--r-- | h-source/Application/Controllers/IssuesController.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/h-source/Application/Controllers/GenericController.php b/h-source/Application/Controllers/GenericController.php index a08956e..1b9e64a 100644 --- a/h-source/Application/Controllers/GenericController.php +++ b/h-source/Application/Controllers/GenericController.php @@ -361,7 +361,7 @@ class GenericController extends BaseController if (count($data['table']) > 0) { - $data['talk_number'] = $this->m['TalkModel']->select('count(*) as numb,id_hard')->where(array('id_hard'=>$clean['id_hard']))->rowNumber(); + $data['talk_number'] = $this->m['TalkModel']->select('count(*) as numb,id_hard')->where(array('id_hard'=>$clean['id_hard'],'deleted'=>'no'))->rowNumber(); $data['ne_name'] = $data['table'][0]['hardware']['model']; $data['name'] = encodeUrl($data['ne_name']); diff --git a/h-source/Application/Controllers/IssuesController.php b/h-source/Application/Controllers/IssuesController.php index 02f6499..80a9486 100644 --- a/h-source/Application/Controllers/IssuesController.php +++ b/h-source/Application/Controllers/IssuesController.php @@ -90,7 +90,7 @@ class IssuesController extends BaseController //load the Pages helper $this->helper('Pages',$this->controller.'/viewall/'.$this->lang,'page'); //get the number of records - $this->m['IssuesModel']->from('issues left join messages')->using('id_issue')->aWhere(array('deleted'=>'no'))->groupBy('issues.id_issue'); + $this->m['IssuesModel']->from('issues left join messages')->using('id_issue')->aWhere(array('deleted'=>'no','-deleted'=>'no'))->groupBy('issues.id_issue'); $recordNumber = $this->m['IssuesModel']->rowNumber(); $page = $this->viewArgs['page']; |