tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
koichirok 2012-02-13 10:23:30 +00:00
parent 767db5bb28
commit e0e14c9db8
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -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".

6
pandora_console/include/javascript/pandora_alerts.js
View File

@ -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;
}