From 7accfb486c2035ba010e1c55e2ab875d8f906bf8 Mon Sep 17 00:00:00 2001 From: Antonio Gallo Date: Fri, 15 Jul 2011 15:43:30 +0000 Subject: permanently deleted devices are no more shown in the history --- h-source/Application/Controllers/BaseController.php | 2 +- h-source/Application/Controllers/SpecialController.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'h-source/Application/Controllers') 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'); -- cgit v1.2.3