From db6e59c9bbc02879bf0e5d074c8145ede62ea634 Mon Sep 17 00:00:00 2001
From: mdtrooper <tres.14159@gmail.com>
Date: Tue, 10 Mar 2015 15:13:14 +0100
Subject: [PATCH] Fixed the preview alert action in the form editor. TICKET:
 #1944

(cherry picked from commit b7264f61c34c12f95dbfd0d67cf354740bf27a6e)

Conflicts:
	pandora_console/godmode/alerts/alert_commands.php
	pandora_console/godmode/alerts/configure_alert_action.php
---
 .../godmode/alerts/alert_commands.php         |  6 +++---
 .../include/javascript/pandora_alerts.js      | 21 ++++++++++++++-----
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/pandora_console/godmode/alerts/alert_commands.php b/pandora_console/godmode/alerts/alert_commands.php
index 3dd4699cc3..d0ded3d06e 100644
--- a/pandora_console/godmode/alerts/alert_commands.php
+++ b/pandora_console/godmode/alerts/alert_commands.php
@@ -123,13 +123,13 @@ if (is_ajax ()) {
 					if (!empty($fv)) {
 						foreach ($fv as $fv_option) {
 							$fv_option = explode(',', $fv_option);
-
+							
 							if (empty($fv_option))
 								continue;
-
+							
 							if (!isset($fv_option[1]))
 								$fv_option[1] = $fv_option[0];
-
+							
 							$fields_value_select[$fv_option[0]] = $fv_option[1];
 						}
 					}
diff --git a/pandora_console/include/javascript/pandora_alerts.js b/pandora_console/include/javascript/pandora_alerts.js
index e9b7c64727..f91bbabfe8 100644
--- a/pandora_console/include/javascript/pandora_alerts.js
+++ b/pandora_console/include/javascript/pandora_alerts.js
@@ -8,33 +8,44 @@ function parse_alert_command (command, classs) {
 		classs = 'fields';
 	}
 	
+	
+	
 	var nfield = 1;
 	$('.' + classs).each(function() {
+		
 		// Only render values different from ''
 		if ($(this).val() == '') {
+			
 			nfield++;
+			
 			return;
 		}
 		var field = '_field' + nfield + '_';
-		nfield++;
-		var regex = new RegExp(field,"gi");
+		
+		var regex = new RegExp(field, "gi");
+		
+		
 		command = command.replace (regex, $(this).val());
+		
+		nfield++;
 	});
 	
 	return command;
 }
 
 function render_command_preview (original_command) {
-	$("#textarea_command_preview").text (parse_alert_command (original_command, ''));
+	$("#textarea_command_preview")
+		.text(parse_alert_command (original_command, ''));
 }
 
 function render_command_recovery_preview (original_command) {
-	$("#textarea_command_recovery_preview").text (parse_alert_command (original_command, 'recovery'));
+	$("#textarea_command_recovery_preview")
+		.text(parse_alert_command (original_command, 'recovery'));
 }
 
 function render_command_description (command_description) {
 	if (command_description != '') {
-		command_description = '<br>'+command_description;
+		command_description = '<br>' + command_description;
 	}
 	$("#command_description").html(command_description);
 }