Se corrige un bug.

[mecon/meconlib.git] / lib / MECON / HTML / ArbolDB.php

diff --git a/lib/MECON/HTML/ArbolDB.php b/lib/MECON/HTML/ArbolDB.php
index 311bed42b8b085e69e5bf05abf6b27f52b6ff790..dedf3b93b37d21b6e2c5f3dd2c4f5e34999b5b4f 100644 (file)
--- a/lib/MECON/HTML/ArbolDB.php
+++ b/lib/MECON/HTML/ArbolDB.php
@@ -126,7 +126,7 @@ class MECON_HTML_ArbolDB extends MECON_HTML_Arbol
      * @return void
      * @access public
      */
      * @return void
      * @access public
      */

-    function MECON_HTML_ArbolDB($dbdata, $titulo, $link_append = '', $expandir = true)
+    function MECON_HTML_ArbolDB($dbdata, $titulo, $link_append = '', $expandir = false)

     {
         if(isset($dbdata['id_padre']))
             $this->padre = $dbdata['id_padre'];
     {
         if(isset($dbdata['id_padre']))
             $this->padre = $dbdata['id_padre'];


@@ -141,6 +141,8 @@ class MECON_HTML_ArbolDB extends MECON_HTML_Arbol
             $this->link = $dbdata['link']; 
         if(isset($dbdata['where']))
             $this->where = $dbdata['where'];
             $this->link = $dbdata['link']; 
         if(isset($dbdata['where']))
             $this->where = $dbdata['where'];

+        if(isset($dbdata['habilitado']))
+            $this->habilitado = $dbdata['habilitado'];

         if(isset($dbdata['order']))
             $this->order = ' ORDER BY '.$dbdata['nombre'].' '.$dbdata['order']; 
         $this->db = $dbdata['db']; 
         if(isset($dbdata['order']))
             $this->order = ' ORDER BY '.$dbdata['nombre'].' '.$dbdata['order']; 
         $this->db = $dbdata['db']; 


@@ -188,6 +190,8 @@ class MECON_HTML_ArbolDB extends MECON_HTML_Arbol
             $sql .= ' AND';
         } elseif ($this->where)
           $sql .= $this->where;
             $sql .= ' AND';
         } elseif ($this->where)
           $sql .= $this->where;

+        if(isset($this->habilitado))
+          $sql .= " AND ".$this->habilitado." = 1 ";

         $sql .= $this->order;
         $result = $this->db->query($sql);
         if(DB::isError($result))
         $sql .= $this->order;
         $result = $this->db->query($sql);
         if(DB::isError($result))