From bdbcf4a26cb860cdff097e1a5c45a7de99c31855 Mon Sep 17 00:00:00 2001
From: jsatoh <junichi@rworks.jp>
Date: Fri, 21 Oct 2011 05:20:37 +0000
Subject: [PATCH] 2011-10-21  Junichi Satoh  <junichi@rworks.jp>

	* godmode/alerts/configure_alert_compound.php: Fixed column order
	inconsistencies.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5073 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                             |  5 +++++
 .../godmode/alerts/configure_alert_compound.php       | 11 ++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index f96dae99c7..1c246d2e86 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-21  Junichi Satoh  <junichi@rworks.jp>
+
+	* godmode/alerts/configure_alert_compound.php: Fixed column order
+	inconsistencies.
+
 2011-10-19  Junichi Satoh  <junichi@rworks.jp>
 
 	* mobile/operation/agents/monitor_status.php,
diff --git a/pandora_console/godmode/alerts/configure_alert_compound.php b/pandora_console/godmode/alerts/configure_alert_compound.php
index 11a7184389..8f38b63df9 100644
--- a/pandora_console/godmode/alerts/configure_alert_compound.php
+++ b/pandora_console/godmode/alerts/configure_alert_compound.php
@@ -510,8 +510,8 @@ if ($step == 2) {
 			$idAgent = agents_get_module_id($alert['id_agent_module']);
 			$nameAgent = agents_get_name($idAgent);
 			$data[1] = '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=' . $idAgent . '">' . $nameAgent . '</a>';
-			$data[2] = alerts_get_alert_template_name ($alert['id_alert_template']);
-			$data[3] = modules_get_agentmodule_name ($alert['id_agent_module']);
+			$data[2] = modules_get_agentmodule_name ($alert['id_agent_module']);
+			$data[3] = alerts_get_alert_template_name ($alert['id_alert_template']);
 			if ($condition['operation'] == 'NOP') {
 				$data[4] = html_print_input_hidden ('operations['.$alert['id'].']', 'NOP', true);
 			} else {
@@ -589,7 +589,7 @@ if ($step == 1) {
 	$table_alerts->id = 'alert_list';
 	$table_alerts->width = '98%';
 	$table_alerts->data = array ();
-	unset ($table_alerts->head[3]);
+	unset ($table_alerts->head[4]);
 	
 	if (! $id_agent) {
 		$table_alerts->class = 'invisible';
@@ -608,8 +608,9 @@ if ($step == 1) {
 			$data[0] = '<a href="#" class="add_alert" id="add-'.$alert['id'].'" />';
 			$data[0] .= html_print_image('images/add.png', true);
 			$data[0] .= '</a>';
-			$data[1] = modules_get_agentmodule_name ($alert['id_agent_module']);
-			$data[2] = alerts_get_alert_template_name ($alert['id_alert_template']);
+			$data[1] = agents_get_name($id_agent);
+			$data[2] = modules_get_agentmodule_name ($alert['id_agent_module']);
+			$data[3] = alerts_get_alert_template_name ($alert['id_alert_template']);
 			
 			array_push ($table_alerts->data, $data);
 		}