diff --git a/webroot/config/networking/routetable/ui/js/models/RtTableModel.js b/webroot/config/networking/routetable/ui/js/models/RtTableModel.js index 9f61ed905..18c38fa5b 100644 --- a/webroot/config/networking/routetable/ui/js/models/RtTableModel.js +++ b/webroot/config/networking/routetable/ui/js/models/RtTableModel.js @@ -64,6 +64,14 @@ define([ var prefix = routesCollection[i]['prefix'](); if ((null != prefix) && (!prefix.length)) { prefix = null; + } else { + if (-1 == prefix.indexOf('/')) { + if (isIPv4(prefix)) { + prefix = prefix + '/32'; + } else if (isIPv6(prefix)) { + prefix = prefix + '/128'; + } + } } var nextHop = routesCollection[i]['next_hop'](); if ((null != nextHop) && (!nextHop.length)) { diff --git a/webroot/config/services/instances/ui/js/models/svcInstModel.js b/webroot/config/services/instances/ui/js/models/svcInstModel.js index 2ac73277a..f9c7105ab 100644 --- a/webroot/config/services/instances/ui/js/models/svcInstModel.js +++ b/webroot/config/services/instances/ui/js/models/svcInstModel.js @@ -251,9 +251,6 @@ define([ if (2 == tmplVersion) { return; } - if (null == imgName) { - return 'Image name not found for this template'; - } var svcVirtType = getValueByJsonPath(tmpl, 'service_template_properties;service_virtualization_type', @@ -261,6 +258,9 @@ define([ if ('physical-device' == svcVirtType) { return; } + if (null == imgName) { + return 'Image name not found for this template'; + } var imgList = window.imageList; var imgCnt = imgList.length; for (var i = 0; i < imgCnt; i++) {