From f54bca87edb864cefff978f7fed8a16ec2fe8336 Mon Sep 17 00:00:00 2001
From: vgilc <vanessa.gil@artica.es>
Date: Wed, 8 Feb 2012 09:50:36 +0000
Subject: [PATCH] 2012-02-08  Vanessa Gil  <vanessa.gil@artica.es> 	*
 godmode/events/custom_events.php: Remove comments.

	* operation/events/events_list.php: Show criticity only for
	  alerts.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5514 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                        |  6 ++++++
 pandora_console/godmode/events/custom_events.php |  3 ---
 pandora_console/operation/events/events_list.php | 14 ++++++++------
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index ac6d7bb034..c86f7b274d 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-08  Vanessa Gil  <vanessa.gil@artica.es>
+	* godmode/events/custom_events.php: Remove comments.
+
+	* operation/events/events_list.php: Show criticity only for
+	  alerts.
+
 2012-02-07  Vanessa Gil  <vanessa.gil@artica.es>
 	* pandoradb.sql
 	  pandoradb.postgreSQL.sql
diff --git a/pandora_console/godmode/events/custom_events.php b/pandora_console/godmode/events/custom_events.php
index bfba338bb3..b2f10402b1 100644
--- a/pandora_console/godmode/events/custom_events.php
+++ b/pandora_console/godmode/events/custom_events.php
@@ -123,9 +123,7 @@ $(document).ready (function () {
 			field_name = $(value).html();
 			if (field_name != <?php echo "'".__('None')."'"; ?>){
 				id_field = $(value).attr('value');
-				//$("select[name='fields_available[]']").append($("<option selected='selected'></option>").val(field_name));
 				$("select[name='fields_selected[]']").append($("<option selected='selected'></option>").html(field_name).attr("value", field_name));
-				//$("select[name='fields_selected[]']").append($("<option></option>").val(field_name).html('<i>' + field_name + '</i>'));
 				$("#fields_available").find("option[value='" + id_field + "']").remove();
 			}
 		});			
@@ -136,7 +134,6 @@ $(document).ready (function () {
 				field_name = $(value).html();
 				if (field_name != <?php echo "'".__('None')."'"; ?>){
 					id_field = $(value).attr('value');
-					//alert(id_field);
 					$("select[name='fields_available[]']").append($("<option></option>").val(field_name).html('<i>' + field_name + '</i>'));
 					$("#fields_selected").find("option[value='" + id_field + "']").remove();
 				}
diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php
index ade8f78c87..5324b6396b 100644
--- a/pandora_console/operation/events/events_list.php
+++ b/pandora_console/operation/events/events_list.php
@@ -825,6 +825,13 @@ foreach ($result as $event) {
 		$string .= '</a></td></tr><tr class="' . $odd . '">';
 		//$odd = '';
 		$odd = ($odd == '')? 'rowOdd' : '';
+		
+		if ($event["criticity"] != '') {
+			$string .= '<tr class="' . $odd . '"><td align="left" valign="top">' . '<b>' . __('Criticity') . '</td><td align="left">';
+			$string .= $event["criticity"];
+			$string .= '</td></tr><tr>';
+			$odd = ($odd == '')? 'rowOdd' : '';
+		}
 	}
 	
 	$string .= '<td align="left" valign="top" width="15%">';
@@ -885,12 +892,7 @@ foreach ($result as $event) {
 		$string .= '<i>- ' . __('Empty') . ' -</i>';
 		$odd = ($odd == '')? 'rowOdd' : '';
 	}
-	if ($event["criticity"] != '') {
-		$string .= '<tr class="' . $odd . '"><td align="left" valign="top">' . '<b>' . __('Criticity') . '</td><td align="left">';
-		$string .= $event["criticity"];
-		$string .= '</td></tr><tr>';
-		$odd = ($odd == '')? 'rowOdd' : '';
-	}
+
 	$string .= '</td></tr>';
 	$string .= '</table>';