From 490f94e2edda97613ed1b4e827efe3b1400f899e Mon Sep 17 00:00:00 2001 From: laf Date: Fri, 22 May 2015 08:17:26 +0100 Subject: [PATCH 1/4] Added response to modal form when an error occurs --- html/forms/create-alert-item.inc.php | 2 +- html/includes/modal/new_alert_rule.inc.php | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/html/forms/create-alert-item.inc.php b/html/forms/create-alert-item.inc.php index e11c56124..152733d2c 100644 --- a/html/forms/create-alert-item.inc.php +++ b/html/forms/create-alert-item.inc.php @@ -27,7 +27,7 @@ $invert = mres($_POST['invert']); $name = mres($_POST['name']); if(empty($rule)) { - $update_message = "ERROR: No rule was generated"; + $update_message = "ERROR: No rule was generated - did you forget to click and / or?"; } elseif(validate_device_id($_POST['device_id']) || $_POST['device_id'] == '-1' || $_POST['device_id'][0] == ':') { $device_id = $_POST['device_id']; if(!is_numeric($count)) { diff --git a/html/includes/modal/new_alert_rule.inc.php b/html/includes/modal/new_alert_rule.inc.php index 59f464e3b..e7d050173 100644 --- a/html/includes/modal/new_alert_rule.inc.php +++ b/html/includes/modal/new_alert_rule.inc.php @@ -32,6 +32,11 @@ if(is_admin() !== false) { +
+
+ +
+
@@ -329,18 +334,19 @@ $('#rule-submit').click('', function(e) { url: "/ajax_form.php", data: $('form.alerts-form').serialize(), success: function(msg){ - $("#message").html('
'+msg+'
'); - $("#create-alert").modal('hide'); if(msg.indexOf("ERROR:") <= -1) { + $("#message").html('
'+msg+'
'); + $("#create-alert").modal('hide'); $('#response').data('tagmanager').empty(); setTimeout(function() { location.reload(1); }, 1000); + } else { + $('#ajax_response').html('
'+msg+'
'); } }, error: function(){ - $("#message").html('
An error occurred creating this alert.
'); - $("#create-alert").modal('hide'); + $("#ajax_response").html('
An error occurred creating this alert.
'); } }); }); From 9726773e0e4653bde5545967118cab2d248c1749 Mon Sep 17 00:00:00 2001 From: laf Date: Fri, 22 May 2015 09:33:52 +0100 Subject: [PATCH 2/4] Added more visual validation --- html/includes/modal/new_alert_rule.inc.php | 29 +++++++++++++++++++--- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/html/includes/modal/new_alert_rule.inc.php b/html/includes/modal/new_alert_rule.inc.php index e7d050173..fa2d7fd0f 100644 --- a/html/includes/modal/new_alert_rule.inc.php +++ b/html/includes/modal/new_alert_rule.inc.php @@ -40,7 +40,7 @@ if(is_admin() !== false) {
- +
@@ -66,15 +66,16 @@ if(is_admin() !== false) {
- +
- - + + +
@@ -308,6 +309,7 @@ $('#map-stub').typeahead({ $('#and, #or').click('', function(e) { e.preventDefault(); + $("#next-step-and").html(""); var entity = $('#suggest').val(); var condition = $('#condition').val(); var value = $('#value').val(); @@ -351,6 +353,25 @@ $('#rule-submit').click('', function(e) { }); }); +$( "#suggest, #value" ).blur(function() { + var $this = $(this); + var suggest = $('#suggest').val(); + var value = $('#value').val(); + if (suggest == "") { + $("#next-step-and").html(""); + $("#value").closest('.form-group').removeClass('has-error'); + $("#suggest").closest('.form-group').addClass('has-error'); + } else if (value == "") { + $("#next-step-and").html(""); + $("#value").closest('.form-group').addClass('has-error'); + $("#suggest").closest('.form-group').removeClass('has-error'); + } else { + $("#value").closest('.form-group').addClass('has-error'); + $("#value").closest('.form-group').removeClass('has-error'); + $("#next-step-and").html(' Click AND / OR'); + } +}) + Date: Fri, 22 May 2015 09:35:55 +0100 Subject: [PATCH 3/4] Changed from addClass to removeClass --- html/includes/modal/new_alert_rule.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/includes/modal/new_alert_rule.inc.php b/html/includes/modal/new_alert_rule.inc.php index fa2d7fd0f..a8d933034 100644 --- a/html/includes/modal/new_alert_rule.inc.php +++ b/html/includes/modal/new_alert_rule.inc.php @@ -366,7 +366,7 @@ $( "#suggest, #value" ).blur(function() { $("#value").closest('.form-group').addClass('has-error'); $("#suggest").closest('.form-group').removeClass('has-error'); } else { - $("#value").closest('.form-group').addClass('has-error'); + $("#value").closest('.form-group').removeClass('has-error'); $("#value").closest('.form-group').removeClass('has-error'); $("#next-step-and").html(' Click AND / OR'); } From f92a305821372c884e7370ee3e9b57b55cfa92f8 Mon Sep 17 00:00:00 2001 From: laf Date: Fri, 22 May 2015 11:10:26 +0100 Subject: [PATCH 4/4] Added error checking to create device group --- html/includes/modal/new_alert_rule.inc.php | 6 +-- html/includes/modal/new_device_group.inc.php | 57 ++++++++++++++++---- 2 files changed, 50 insertions(+), 13 deletions(-) diff --git a/html/includes/modal/new_alert_rule.inc.php b/html/includes/modal/new_alert_rule.inc.php index a8d933034..0eba7bd0c 100644 --- a/html/includes/modal/new_alert_rule.inc.php +++ b/html/includes/modal/new_alert_rule.inc.php @@ -132,7 +132,7 @@ if(is_admin() !== false) {
- +
@@ -366,11 +366,11 @@ $( "#suggest, #value" ).blur(function() { $("#value").closest('.form-group').addClass('has-error'); $("#suggest").closest('.form-group').removeClass('has-error'); } else { - $("#value").closest('.form-group').removeClass('has-error'); + $("#suggest").closest('.form-group').removeClass('has-error'); $("#value").closest('.form-group').removeClass('has-error'); $("#next-step-and").html(' Click AND / OR'); } -}) +}); diff --git a/html/includes/modal/new_device_group.inc.php b/html/includes/modal/new_device_group.inc.php index 8b9490bc8..aa5717b28 100644 --- a/html/includes/modal/new_device_group.inc.php +++ b/html/includes/modal/new_device_group.inc.php @@ -24,16 +24,21 @@ if(is_admin() !== false) {
+
+
+ +
+
- +
- +
@@ -41,7 +46,7 @@ if(is_admin() !== false) {
- +
@@ -52,7 +57,7 @@ if(is_admin() !== false) {
- @@ -67,14 +72,15 @@ if(is_admin() !== false) {
- +
- - + + +
@@ -84,7 +90,7 @@ if(is_admin() !== false) {
- +
@@ -164,6 +170,7 @@ $('#suggest').typeahead({ $('#and, #or').click('', function(e) { e.preventDefault(); + $("#next-step-and").html(""); var entity = $('#suggest').val(); var condition = $('#condition').val(); var value = $('#value').val(); @@ -188,13 +195,15 @@ $('#group-submit').click('', function(e) { url: "/ajax_form.php", data: $('form.group-form').serialize(), success: function(msg){ - $("#message").html('
'+msg+'
'); - $("#create-group").modal('hide'); if(msg.indexOf("ERROR:") <= -1) { + $("#message").html('
'+msg+'
'); + $("#create-group").modal('hide'); $('#response').data('tagmanager').empty(); setTimeout(function() { location.reload(1); }, 1000); + } else { + $('#ajax_response').html('
'+msg+'
'); } }, error: function(){ @@ -204,6 +213,34 @@ $('#group-submit').click('', function(e) { }); }); +$( "#name, #suggest, #value" ).blur(function() { + var $this = $(this); + var name = $('#name').val(); + var suggest = $('#suggest').val(); + var value = $('#value').val(); + if (name == "") { + $("#next-step-and").html(""); + $("#suggest").closest('.form-group').removeClass('has-error'); + $("#value").closest('.form-group').removeClass('has-error'); + $("#name").closest('.form-group').addClass('has-error'); + } else if (suggest == "") { + $("#next-step-and").html(""); + $("#name").closest('.form-group').removeClass('has-error'); + $("#value").closest('.form-group').removeClass('has-error'); + $("#suggest").closest('.form-group').addClass('has-error'); + } else if (value == "") { + $("#next-step-and").html(""); + $("#name").closest('.form-group').removeClass('has-error'); + $("#suggest").closest('.form-group').removeClass('has-error'); + $("#value").closest('.form-group').addClass('has-error'); + } else { + $("#name").closest('.form-group').removeClass('has-error'); + $("#suggest").closest('.form-group').removeClass('has-error'); + $("#value").closest('.form-group').removeClass('has-error'); + $("#next-step-and").html(' Click AND / OR'); + } +}); +