From 22fed25b315f8a2b4ecb19fbf5c6fc8e96e0358c Mon Sep 17 00:00:00 2001
From: mdtrooper <tres.14159@gmail.com>
Date: Fri, 14 May 2010 10:36:19 +0000
Subject: [PATCH] 2010-05-14 Miguel de Dios <miguel.dedios@artica.es>
* godmode/groups/group_list.php: fixed the request of group data when get
data about "All" group.
Fixes: #2993501
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2730 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
pandora_console/ChangeLog | 6 ++++++
pandora_console/godmode/groups/group_list.php | 12 ++++++++++++
2 files changed, 18 insertions(+)
diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 57347c8ffc..5f32540732 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-14 Miguel de Dios <miguel.dedios@artica.es>
+
+ * godmode/groups/group_list.php: fixed the request of group data when get
+ data about "All" group.
+ Fixes: #2993501
+
2010-05-14 Sergio Martin <sergio.martin@artica.es>
* godmode/reporting/visual_console_builder.php: Fixed
diff --git a/pandora_console/godmode/groups/group_list.php b/pandora_console/godmode/groups/group_list.php
index af45602933..499f69368d 100644
--- a/pandora_console/godmode/groups/group_list.php
+++ b/pandora_console/godmode/groups/group_list.php
@@ -33,6 +33,18 @@ if (is_ajax ()) {
if ($get_group_json) {
$id_group = (int) get_parameter ('id_group');
+ if ($id_group == 0) {
+ $group = array('id_grupo' => 0,
+ 'nombre' => 'All',
+ 'icon' => 'world',
+ 'parent' => 0,
+ 'disabled' => 0,
+ 'custom_id' => null);
+
+ echo json_encode ($group);
+ return;
+ }
+
if (! give_acl ($config['id_user'], $id_group, "AR")) {
audit_db ($config['id_user'], $_SERVER['REMOTE_ADDR'], "ACL Violation",
"Trying to access Alert Management");