diff --git a/Netdisco/Changes b/Netdisco/Changes index 746506bb..e369bd9a 100644 --- a/Netdisco/Changes +++ b/Netdisco/Changes @@ -10,6 +10,7 @@ * [#250] Linux SSHColletor cannot handle uppercase MACs * Return from device discover if device is unknown * Safely continue macsuck if neighbor cannot be resolved + * [#261] String replace failed in reports (M. Kosmach) 2.033004 - 2015-11-16 diff --git a/Netdisco/share/views/ajax/report/apchanneldist.tt b/Netdisco/share/views/ajax/report/apchanneldist.tt index 22f16d74..5dd9b556 100644 --- a/Netdisco/share/views/ajax/report/apchanneldist.tt +++ b/Netdisco/share/views/ajax/report/apchanneldist.tt @@ -20,7 +20,7 @@ $(document).ready(function() { "data": 'ch_count', "searchable": false, "render": function(data, type, row, meta) { - return data.replace(/\B(?=(\d{3})+(?!\d))/g, ","); + return data.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ","); } } ], diff --git a/Netdisco/share/views/ajax/report/apclients.tt b/Netdisco/share/views/ajax/report/apclients.tt index ca64c4f8..c3fc8cd3 100644 --- a/Netdisco/share/views/ajax/report/apclients.tt +++ b/Netdisco/share/views/ajax/report/apclients.tt @@ -53,7 +53,7 @@ $(document).ready(function() { "data": 'mac_count', "searchable": false, "render": function(data, type, row, meta) { - return data.replace(/\B(?=(\d{3})+(?!\d))/g, ","); + return data.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ","); } } ], diff --git a/Netdisco/share/views/ajax/report/devicepoestatus.tt b/Netdisco/share/views/ajax/report/devicepoestatus.tt index 76e0ec33..3ff2d9a5 100644 --- a/Netdisco/share/views/ajax/report/devicepoestatus.tt +++ b/Netdisco/share/views/ajax/report/devicepoestatus.tt @@ -102,49 +102,49 @@ $(document).ready(function() { "className": "nd_center-cell", "searchable": false, "render": function(data, type, row, meta) { - return data.replace(/\B(?=(\d{3})+(?!\d))/g, ","); + return data.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ","); } }, { "data": 'poe_capable_ports', "className": "nd_center-cell", "searchable": false, "render": function(data, type, row, meta) { - return data.replace(/\B(?=(\d{3})+(?!\d))/g, ","); + return data.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ","); } }, { "data": 'poe_powered_ports', "className": "nd_center-cell", "searchable": false, "render": function(data, type, row, meta) { - return data.replace(/\B(?=(\d{3})+(?!\d))/g, ","); + return data.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ","); } }, { "data": 'poe_disabled_ports', "className": "nd_center-cell", "searchable": false, "render": function(data, type, row, meta) { - return data.replace(/\B(?=(\d{3})+(?!\d))/g, ","); + return data.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ","); } }, { "data": 'poe_errored_ports', "className": "nd_center-cell", "searchable": false, "render": function(data, type, row, meta) { - return data.replace(/\B(?=(\d{3})+(?!\d))/g, ","); + return data.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ","); } }, { "data": 'poe_power_committed', "className": "nd_center-cell", "searchable": false, "render": function(data, type, row, meta) { - return data.replace(/\B(?=(\d{3})+(?!\d))/g, ","); + return data.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ","); } }, { "data": 'poe_power_delivering', "className": "nd_center-cell", "searchable": false, "render": function(data, type, row, meta) { - return data.replace(/\B(?=(\d{3})+(?!\d))/g, ","); + return data.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ","); } } ], diff --git a/Netdisco/share/views/ajax/report/moduleinventory.tt b/Netdisco/share/views/ajax/report/moduleinventory.tt index 19c0ab6c..9c6576b8 100644 --- a/Netdisco/share/views/ajax/report/moduleinventory.tt +++ b/Netdisco/share/views/ajax/report/moduleinventory.tt @@ -100,7 +100,7 @@ $(document).ready(function() { }, { "data": 'count', "render": function(data, type, row, meta) { - return data.replace(/\B(?=(\d{3})+(?!\d))/g, ","); + return data.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ","); } } ], diff --git a/Netdisco/share/views/ajax/report/netbios.tt b/Netdisco/share/views/ajax/report/netbios.tt index 6134b412..81205920 100644 --- a/Netdisco/share/views/ajax/report/netbios.tt +++ b/Netdisco/share/views/ajax/report/netbios.tt @@ -80,7 +80,7 @@ $(document).ready(function() { }, { "data": 'count', "render": function(data, type, row, meta) { - return data.replace(/\B(?=(\d{3})+(?!\d))/g, ","); + return data.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ","); } } ], diff --git a/Netdisco/share/views/ajax/report/nodemultiips.tt b/Netdisco/share/views/ajax/report/nodemultiips.tt index 1d70e853..1348d067 100644 --- a/Netdisco/share/views/ajax/report/nodemultiips.tt +++ b/Netdisco/share/views/ajax/report/nodemultiips.tt @@ -36,7 +36,7 @@ $(document).ready(function() { "data": 'ip_count', "searchable": false, "render": function(data, type, row, meta) { - return data.replace(/\B(?=(\d{3})+(?!\d))/g, ","); + return data.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ","); } } ], diff --git a/Netdisco/share/views/ajax/report/nodevendor.tt b/Netdisco/share/views/ajax/report/nodevendor.tt index 0f6f70b0..178dda66 100644 --- a/Netdisco/share/views/ajax/report/nodevendor.tt +++ b/Netdisco/share/views/ajax/report/nodevendor.tt @@ -76,7 +76,7 @@ $(document).ready(function() { }, { "data": 'count', "render": function(data, type, row, meta) { - return data.replace(/\B(?=(\d{3})+(?!\d))/g, ","); + return data.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ","); } } ], diff --git a/Netdisco/share/views/ajax/report/portmultinodes.tt b/Netdisco/share/views/ajax/report/portmultinodes.tt index 8482edfd..8b45c411 100644 --- a/Netdisco/share/views/ajax/report/portmultinodes.tt +++ b/Netdisco/share/views/ajax/report/portmultinodes.tt @@ -38,7 +38,7 @@ $(document).ready(function() { "data": 'mac_count', "searchable": false, "render": function(data, type, row, meta) { - return data.replace(/\B(?=(\d{3})+(?!\d))/g, ","); + return data.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ","); } } ], diff --git a/Netdisco/share/views/ajax/report/portssid.tt b/Netdisco/share/views/ajax/report/portssid.tt index 23e5e9e8..6aaf5a4e 100644 --- a/Netdisco/share/views/ajax/report/portssid.tt +++ b/Netdisco/share/views/ajax/report/portssid.tt @@ -75,7 +75,7 @@ $(document).ready(function() { "data": 'count', "searchable": false, "render": function(data, type, row, meta) { - return data.replace(/\B(?=(\d{3})+(?!\d))/g, ","); + return data.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ","); } }, ], diff --git a/Netdisco/share/views/ajax/report/portutilization.tt b/Netdisco/share/views/ajax/report/portutilization.tt index cb1ec9d7..7900e4ee 100644 --- a/Netdisco/share/views/ajax/report/portutilization.tt +++ b/Netdisco/share/views/ajax/report/portutilization.tt @@ -25,25 +25,25 @@ $(document).ready(function() { "data": 'port_count', "searchable": false, "render": function(data, type, row, meta) { - return data.replace(/\B(?=(\d{3})+(?!\d))/g, ","); + return data.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ","); } }, { "data": 'ports_in_use', "searchable": false, "render": function(data, type, row, meta) { - return data.replace(/\B(?=(\d{3})+(?!\d))/g, ","); + return data.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ","); } }, { "data": 'ports_shutdown', "searchable": false, "render": function(data, type, row, meta) { - return data.replace(/\B(?=(\d{3})+(?!\d))/g, ","); + return data.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ","); } }, { "data": 'ports_free', "searchable": false, "render": function(data, type, row, meta) { - return data.replace(/\B(?=(\d{3})+(?!\d))/g, ","); + return data.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ","); } } ], diff --git a/Netdisco/share/views/ajax/report/vlaninventory.tt b/Netdisco/share/views/ajax/report/vlaninventory.tt index 5b27c15d..88c041b9 100644 --- a/Netdisco/share/views/ajax/report/vlaninventory.tt +++ b/Netdisco/share/views/ajax/report/vlaninventory.tt @@ -29,13 +29,13 @@ $(document).ready(function() { "data": 'dcount', "searchable": false, "render": function(data, type, row, meta) { - return data.replace(/\B(?=(\d{3})+(?!\d))/g, ","); + return data.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ","); } }, { "data": 'pcount', "searchable": false, "render": function(data, type, row, meta) { - return data.replace(/\B(?=(\d{3})+(?!\d))/g, ","); + return data.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ","); } } ],