From c647ae80489ce8cfacaa657b8d27e17ebc2f9742 Mon Sep 17 00:00:00 2001
From: Alejandro Gallardo Escobar <alex@artica.es>
Date: Thu, 18 Dec 2014 11:04:41 +0100
Subject: [PATCH] Fixes

---
 pandora_console/include/class/Tree.class.php  |  2 +-
 .../include/javascript/tree/TreeController.js |  2 +-
 pandora_console/operation/tree2.php           | 37 ++++++++++++++-----
 3 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/pandora_console/include/class/Tree.class.php b/pandora_console/include/class/Tree.class.php
index 289ce15203..adbee1c738 100644
--- a/pandora_console/include/class/Tree.class.php
+++ b/pandora_console/include/class/Tree.class.php
@@ -70,7 +70,7 @@ class Tree {
 		// First filter by name and father
 		$groups = db_get_all_rows_filter('tgrupo',
 			$filter,
-			array('id_grupo', 'nombre'));
+			array('id_grupo', 'nombre'));html_debug_print($groups, true);
 		if (empty($groups))
 			$groups = array();
 		
diff --git a/pandora_console/include/javascript/tree/TreeController.js b/pandora_console/include/javascript/tree/TreeController.js
index 000480216d..366e8c07de 100644
--- a/pandora_console/include/javascript/tree/TreeController.js
+++ b/pandora_console/include/javascript/tree/TreeController.js
@@ -151,7 +151,7 @@ TreeController = {
 									.removeClass("leaf-closed")
 									.removeClass("leaf-error")
 									.addClass("leaf-loading");
-
+									
 								$.ajax({
 									url: controller.ajaxURL,
 									type: 'POST',
diff --git a/pandora_console/operation/tree2.php b/pandora_console/operation/tree2.php
index ae2e8efb1a..99d38859b1 100644
--- a/pandora_console/operation/tree2.php
+++ b/pandora_console/operation/tree2.php
@@ -116,7 +116,9 @@ $table->data[0][3] = html_print_input_text(
 $table->data[0][4] = html_print_submit_button(
 	__('Filter'), "uptbutton", false, 'class="sub search"', true);
 
+echo '<form id="tree_search" method="post" action="index.php?sec=monitoring&sec2=operation/tree&refr=0&tab='.$tab.'&pure='.$config['pure'].'">';
 html_print_table($table);
+echo '</form>';
 
 // --------------------- form filter -----------------------------------
 
@@ -128,16 +130,32 @@ echo "<div id='tree-controller-detail-recipient'>";
 echo "</div>";
 ?>
 <script type="text/javascript">
-	$(document).ready(function() {
-		var treeController = TreeController.getController();
-		
+	$(".loading_tree").hide();
+	
+	var treeController = TreeController.getController();
+
+	processTreeSearch();
+
+	$("form#tree_search").submit(function(e) {
+		e.preventDefault();
+
+		processTreeSearch();
+	});
+
+	function processTreeSearch () {
+		$(".loading_tree").show();
+
 		var parameters = {};
 		parameters['page'] = "include/ajax/tree.ajax";
 		parameters['getChildren'] = 1;
 		parameters['filter'] = {};
-		parameters['filter']['type'] = "<?php echo $tab; ?>";
-		parameters['filter']['search'] = "<?php echo $search; ?>";
-		parameters['filter']['status'] = "<?php echo $status; ?>";
+		parameters['type'] = "<?php echo $tab; ?>";
+		parameters['filter']['search'] = function () {
+			return $("input#text-search").val();
+		};
+		parameters['filter']['status'] = function () {
+			return $("select#status").val();
+		};
 		
 		$.ajax({
 			type: "POST",
@@ -155,13 +173,14 @@ echo "</div>";
 						baseURL: "<?php echo $config['homeurl']; ?>/",
 						ajaxURL: "<?php echo $config['homeurl']; ?>/ajax.php",
 						filter: {
-							search: "<?php echo $tab; ?>",
-							status: "<?php echo $status; ?>"
+							search: parameters['filter']['search'],
+							status: parameters['filter']['status']
 						}
 					});
 				}
 			},
 			dataType: "json"
 		});
-	});
+	}
+
 </script>
\ No newline at end of file