Title: [opsview] [11626] Allow and process decimal places.
- Revision
- 11626
- Author
- pknight
- Date
- 2013-02-28 16:58:19 +0000 (Thu, 28 Feb 2013)
Log Message
Allow and process decimal places.
Modified Paths
Modified: trunk/opsview-core/nagios-plugins/check_snmp_interfaces_cascade
===================================================================
--- trunk/opsview-core/nagios-plugins/check_snmp_interfaces_cascade 2013-02-28 16:44:49 UTC (rev 11625)
+++ trunk/opsview-core/nagios-plugins/check_snmp_interfaces_cascade 2013-02-28 16:58:19 UTC (rev 11626)
@@ -896,16 +896,17 @@
$criteria = lc $criteria;
my ( $input, $conjunction, $output );
- if ( $criteria =~ /^\s*in\s+([\d:%]+)\s+(and|or)\s+out\s+([\d:%]+)\s*$/ ) {
+ if ( $criteria =~ /^\s*in\s+([.\d:%]+)\s+(and|or)\s+out\s+([.\d:%]+)\s*$/ )
+ {
( $input, $conjunction, $output ) = ( $1, $2, $3 );
}
- elsif ( $criteria =~ /^\s*in\s+([\d:%]+)\s*$/ ) {
+ elsif ( $criteria =~ /^\s*in\s+([.\d:%]+)\s*$/ ) {
$input = $1;
}
- elsif ( $criteria =~ /^\s*out\s+([\d:%]+)\s*$/ ) {
+ elsif ( $criteria =~ /^\s*out\s+([.\d:%]+)\s*$/ ) {
$output = $1;
}
- elsif ( $criteria =~ /^\s*([\d:%]+)\s*$/ ) {
+ elsif ( $criteria =~ /^\s*([.\d:%]+)\s*$/ ) {
$input = $output = $1;
$conjunction = 'or';
}
Modified: trunk/opsview-core/share/_javascript_/forms.js
===================================================================
--- trunk/opsview-core/share/_javascript_/forms.js 2013-02-28 16:44:49 UTC (rev 11625)
+++ trunk/opsview-core/share/_javascript_/forms.js 2013-02-28 16:58:19 UTC (rev 11626)
@@ -34,7 +34,7 @@
var i;
var hide = true;
var checked = true;
- if (reversed) {
+ if (reversed) {
checked = false;
}
jQuery(':input', thisForm).each(function(){
@@ -159,7 +159,7 @@
var invalidTimeperiodChars = /[\[\]`~!$%^&*|'"<>?()=a-zA-Z ]/; /* timeperiods */
var invalidCharsIP = /[\[\]`~!$%^&*|'"<>?,()= ]/;
var integer_percent = /[\[\]\/£,.@+:;\\{}_#`~!$^&*|'"<>?()=a-zA-Z ]/; /* whole numbers with a percent sign */
-var integer_percent_colon_space_ampersand_bar_uppercaseletter = /[\[\]\/£,.@+;\\{}_#`~!$^*'"<>?()=a-z]/; /* as integer_percent, plus some */
+var integer_percent_colon_space_ampersand_bar = /[\[\]\/£,@+;\\{}_#`~!$^*'"<>?()=]/;
var integer = /[\[\]\/£,.@+:;\\{}_#`~!$%^&*|'"<>?()=a-zA-Z ]/; /* whole numbers only */
function blockInvalidKeys(objEvent, chars) {
@@ -181,7 +181,7 @@
} else if (chars == 9) {
chars = invalidCharsAllowParenthesis;
} else if (chars == 10) {
- chars = integer_percent_colon_space_ampersand_bar_uppercaseletter;
+ chars = integer_percent_colon_space_ampersand_bar;
} else {
chars = invalidChars;
}
_______________________________________________
Opsview-checkins mailing list
Opsview-checkins@lists.opsview.org
http://lists.opsview.org/lists/listinfo/opsview-checkins
