From b6959688093a8ec9029d1431abf208d835ba5088 Mon Sep 17 00:00:00 2001
From: koichirok <koichiro@rworks.jp>
Date: Mon, 13 Feb 2012 10:23:30 +0000
Subject: [PATCH] 2012-02-13 Koichiro Kikuchi <koichiro@rworks.jp>
* include/javascript/pandora_alerts.js: Removed double quotes which encolse
substituted field[1-3] from command preview. pandora_server doesn't add
double quotes to enclose these fields.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5562 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
pandora_console/ChangeLog | 6 ++++++
pandora_console/include/javascript/pandora_alerts.js | 6 +++---
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 2d354ca110..7714d9cc48 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-13 Koichiro Kikuchi <koichiro@rworks.jp>
+
+ * include/javascript/pandora_alerts.js: Removed double quotes which encolse
+ substituted field[1-3] from command preview. pandora_server doesn't add
+ double quotes to enclose these fields.
+
2012-02-13 Vanessa Gil <vanessa.gil@artica.es>
* operation/events/events_validate: Display options: validate and
add a comment when the event status is "in process".
diff --git a/pandora_console/include/javascript/pandora_alerts.js b/pandora_console/include/javascript/pandora_alerts.js
index 2f3bb89847..96b11dcaf4 100644
--- a/pandora_console/include/javascript/pandora_alerts.js
+++ b/pandora_console/include/javascript/pandora_alerts.js
@@ -3,15 +3,15 @@ var original_command = "";
function parse_alert_command (command) {
value = $("#text-field1").attr ("value");
re = /_FIELD1_/gi;
- command = command.replace (re, "\""+value+"\"");
+ command = command.replace (re, value);
value = $("#text-field2").attr ("value");
re = /_FIELD2_/gi;
- command = command.replace (re, "\""+value+"\"");
+ command = command.replace (re, value);
value = $("#textarea_field3").val();
re = /_FIELD3_/gi;
- command = command.replace (re, "\""+value+"\"");
+ command = command.replace (re, value);
return command;
}