mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: Number comparisons in alerts and device groups (#7695)

Browse Source 
Remove quotes so if the field we are comparing against is a string type, we still do a number comparison.
This commit is contained in:
Tony Murray
2017-11-09 20:37:45 +00:00
committed by Neil Lathwood
parent de6266cb88
commit 8b3bd57303
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/includes/modal/new_alert_rule.inc.php
+1 -1
View File
@@ -357,7 +357,7 @@ $('#and').click('', function(e) {
strategy: 'array',
tagFieldName: 'rules[]'
});
if(value.indexOf("%") < 0) {
if(value.indexOf("%") < 0 && isNaN(value)) {
value = '"'+value+'"';
}
if(entity.indexOf("%") < 0) {
html/includes/modal/new_device_group.inc.php
+6 -4
View File
@@ -181,11 +181,13 @@ $('#and, #or').click('', function(e) {
strategy: 'array',
tagFieldName: 'patterns[]'
});
if(entity.indexOf("%") >= 0) {
$('#response').data('tagmanager').populate([ entity+' '+condition+' '+value+' '+glue ]);
} else {
$('#response').data('tagmanager').populate([ '%'+entity+' '+condition+' "'+value+'" '+glue ]);
if(value.indexOf("%") < 0 && isNaN(value)) {
value = '"'+value+'"';
}
if(entity.indexOf("%") < 0) {
entity = '%'+entity;
}
$('#response').data('tagmanager').populate([ entity+' '+condition+' '+value+' '+glue ]);
}
});