clones/librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-09-24 03:48:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added response to modal form when an error occurs

Browse Source
This commit is contained in:
laf 2015-05-22 08:17:26 +01:00
parent d124e55b3d
commit 490f94e2ed
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
html/forms/create-alert-item.inc.php
View File

@ -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)) {

14
html/includes/modal/new_alert_rule.inc.php
View File

@ -32,6 +32,11 @@ if(is_admin() !== false) {
<input type="hidden" name="device_id" id="device_id" value="">
<input type="hidden" name="alert_id" id="alert_id" value="">
<input type="hidden" name="type" id="type" value="create-alert-item">
<div class="form-group">
<div class="col-sm-12">
<span id="ajax_response"></span>
</div>
</div>
<div class="form-group">
<label for='entity' class='col-sm-3 control-label'>Entity: </label>
<div class="col-sm-5">
@ -329,18 +334,19 @@ $('#rule-submit').click('', function(e) {
url: "/ajax_form.php",
data: $('form.alerts-form').serialize(),
success: function(msg){
$("#message").html('<div class="alert alert-info">'+msg+'</div>');
$("#create-alert").modal('hide');
if(msg.indexOf("ERROR:") <= -1) {
$("#message").html('<div class="alert alert-info">'+msg+'</div>');
$("#create-alert").modal('hide');
$('#response').data('tagmanager').empty();
setTimeout(function() {
location.reload(1);
}, 1000);
} else {
$('#ajax_response').html('<div class="alert alert-danger alert-dismissible"><button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>'+msg+'</div>');
}
},
error: function(){
$("#message").html('<div class="alert alert-info">An error occurred creating this alert.</div>');
$("#create-alert").modal('hide');
$("#ajax_response").html('<div class="alert alert-info">An error occurred creating this alert.</div>');
}
});
});