aboutsummaryrefslogtreecommitdiff
path: root/h-source/Application/Controllers
diff options
context:
space:
mode:
authorAntonio Gallo <tonicucoz@gmail.com>2011-07-17 13:02:59 +0000
committerAntonio Gallo <tonicucoz@gmail.com>2011-07-17 13:02:59 +0000
commitcfe669be36d115c3bc4c98c8215c51480185e64e (patch)
tree3265683b25f41f9180680917a157c88d179ded84 /h-source/Application/Controllers
parent7accfb486c2035ba010e1c55e2ab875d8f906bf8 (diff)
perm deleted devices are no more catalogued
Diffstat (limited to 'h-source/Application/Controllers')
-rw-r--r--h-source/Application/Controllers/DownloadController.php2
-rw-r--r--h-source/Application/Controllers/GenericController.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/h-source/Application/Controllers/DownloadController.php b/h-source/Application/Controllers/DownloadController.php
index 879bded..2fcacfa 100644
--- a/h-source/Application/Controllers/DownloadController.php
+++ b/h-source/Application/Controllers/DownloadController.php
@@ -163,7 +163,7 @@ class DownloadController extends BaseController
{
header ("Content-Type:text/xml");
- $res = $this->m['HardwareModel']->clear()->select()->where($whereArray)->orderBy("type,hardware.id_hard")->send();
+ $res = $this->m['HardwareModel']->clear()->select()->where($whereArray)->aWhere(array("cleared"=>"no"))->orderBy("type,hardware.id_hard")->send();
$data['xml'] = $this->getXml($res);
diff --git a/h-source/Application/Controllers/GenericController.php b/h-source/Application/Controllers/GenericController.php
index ed36952..8ab98ba 100644
--- a/h-source/Application/Controllers/GenericController.php
+++ b/h-source/Application/Controllers/GenericController.php
@@ -432,7 +432,7 @@ class GenericController extends BaseController
$data['tree'] = $this->controller;
- $this->mod->aWhere(array("deleted"=>"no"));
+ $this->mod->aWhere(array("deleted"=>"no","cleared"=>"no"));
$this->mod->popupBuild();
$popup = $this->mod->popupArray;