[checkmk-commits] Check_MK Git: check_mk: #1639 FIX Interfaces with speed more than 10GBit/ s can now be configured correctly

Module: check_mk Branch: master Commit: 26fc40afdced8f1ad8be122422a4251e18edd58b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26fc40afdced8f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 4 11:43:33 2014 +0100 #1639 FIX Interfaces with speed more than 10GBit/s can now be configured correctly --- .werks/1639 | 7 +++++++ ChangeLog | 1 + web/htdocs/valuespec.py | 4 ++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.werks/1639 b/.werks/1639 new file mode 100644 index 0000000..26a842e --- /dev/null +++ b/.werks/1639 @@ -0,0 +1,7 @@ +Title: Interfaces with speed more than 10GBit/s can now be configured correctly +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.5i7 +Date: 1417689631 +Class: fix diff --git a/ChangeLog b/ChangeLog index 32a6929..8eb9264 100644 --- a/ChangeLog +++ b/ChangeLog @@ -165,6 +165,7 @@ * 1620 FIX: Fixed exception during host renaming when host has no perfdata * 1625 FIX: Safely handle characters that have a special meaning in regexes when creating service-specific rules... * 1637 FIX: Fixed exception in notification analysis when notifications have not NOTIFICATIONTYPE set + * 1639 FIX: Interfaces with speed more than 10GBit/s can now be configured correctly Notifications: * 1512 Bulk notification can now be grouped according to custom macro values... diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 131718e..a8896ff 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -292,7 +292,7 @@ class Integer(ValueSpec): return text def validate_datatype(self, value, varprefix): - if type(value) != int: + if type(value) not in [ int, long ]: raise MKUserError(varprefix, _("The value %r has the wrong type %s, but must be of type int") % (value, type_name(value))) @@ -1085,7 +1085,7 @@ class Float(Integer): def validate_datatype(self, value, varprefix): if type(value) != float and not \ - (type(value) == int and self._allow_int): + (type(value) not in [ int, long ] and self._allow_int): raise MKUserError(varprefix, _("The value %r has type %s, but must be of type float%s") % (value, type_name(value), self._allow_int and _(" or int") or ""))