From d516bf70f0c7ec1f1788f6dd341e3b2e60e3ec58 Mon Sep 17 00:00:00 2001
From: Alejandro Gallardo Escobar <alex@artica.es>
Date: Tue, 30 Dec 2014 16:23:31 +0100
Subject: [PATCH] Error fixes
---
.../include/javascript/tree/TreeController.js | 15 +++++++++++----
pandora_console/operation/tree2.php | 3 +++
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/pandora_console/include/javascript/tree/TreeController.js b/pandora_console/include/javascript/tree/TreeController.js
index 79387164cc..de7e299e3a 100644
--- a/pandora_console/include/javascript/tree/TreeController.js
+++ b/pandora_console/include/javascript/tree/TreeController.js
@@ -80,7 +80,9 @@ TreeController = {
none: "Total"
},
fired: {
-
+ agents: "Alert fired",
+ modules: "Alert fired",
+ none: "Alert fired"
},
critical: {
agents: "Critical agents",
@@ -348,11 +350,11 @@ TreeController = {
container.append($node);
- if (typeof element.tree != 'undefined' && element.tree.length > 0) {
+ if (typeof element.children != 'undefined' && element.children.length > 0) {
$node.addClass("leaf-closed");
// Add children
- var $children = _processGroup($node, element.tree);
+ var $children = _processGroup($node, element.children);
$node.data('children', $children);
$leafIcon.click(function (e) {
@@ -395,13 +397,18 @@ TreeController = {
getChildren: 1,
id: element.id,
type: element.type,
- filter: controller.filter
+ filter: controller.filter,
+ childrenMethod: 'live',
+ countModuleStatusMethod: 'live',
+ countAgentStatusMethod: 'live'
},
complete: function(xhr, textStatus) {
$node.removeClass("leaf-loading");
$node.addClass("children-loaded");
},
success: function(data, textStatus, xhr) {
+ data = $.parseJSON(data);
+
if (data.success) {
if (typeof data.tree != 'undefined' && data.tree.length > 0) {
diff --git a/pandora_console/operation/tree2.php b/pandora_console/operation/tree2.php
index 33ea280fa4..eada42a9c3 100644
--- a/pandora_console/operation/tree2.php
+++ b/pandora_console/operation/tree2.php
@@ -156,6 +156,9 @@ echo "</div>";
parameters['type'] = "<?php echo $tab; ?>";
parameters['filter']['search'] = $("input#text-search").val();
parameters['filter']['status'] = $("select#status").val();
+ parameters['childrenMethod'] = 'live';
+ parameters['countModuleStatusMethod'] = 'live';
+ parameters['countAgentStatusMethod'] = 'live';
$.ajax({
type: "POST",