aboutsummaryrefslogtreecommitdiff
path: root/h-source/Application/Controllers
diff options
context:
space:
mode:
authorAntonio Gallo <tonicucoz@gmail.com>2011-07-15 15:43:30 +0000
committerAntonio Gallo <tonicucoz@gmail.com>2011-07-15 15:43:30 +0000
commit7accfb486c2035ba010e1c55e2ab875d8f906bf8 (patch)
tree2582739b8b05559000c1659f21b98805a78acb51 /h-source/Application/Controllers
parentff7042aba4ba6a98b98b7a4435417d63374f2d69 (diff)
permanently deleted devices are no more shown in the history
Diffstat (limited to 'h-source/Application/Controllers')
-rw-r--r--h-source/Application/Controllers/BaseController.php2
-rw-r--r--h-source/Application/Controllers/SpecialController.php1
2 files changed, 2 insertions, 1 deletions
diff --git a/h-source/Application/Controllers/BaseController.php b/h-source/Application/Controllers/BaseController.php
index f40d45f..c636f8d 100644
--- a/h-source/Application/Controllers/BaseController.php
+++ b/h-source/Application/Controllers/BaseController.php
@@ -138,7 +138,7 @@ class BaseController extends Controller
->clear()->select()
->inner('hardware')
->on('hardware.id_hard=history.id')
- ->where(array('type'=>'hardware','gr'=>'registered','deleted'=>'no'))
+ ->where(array('type'=>'hardware','gr'=>'registered','deleted'=>'no','cleared'=>'no',))
->orderBy('id_history desc')
->limit(5)
->send();
diff --git a/h-source/Application/Controllers/SpecialController.php b/h-source/Application/Controllers/SpecialController.php
index db3975b..3776a18 100644
--- a/h-source/Application/Controllers/SpecialController.php
+++ b/h-source/Application/Controllers/SpecialController.php
@@ -105,6 +105,7 @@ class SpecialController extends BaseController
'gr' => 'registered',
'type' => 'hardware',
'deleted' => 'no',
+ 'cleared' => 'no',
);
$this->helper('Pages','special/'.$this->action.'/'.$this->lang,'page');