From 8b55d8b1b0d740ea736b080c8d48ed2dd1d528b6 Mon Sep 17 00:00:00 2001 From: bfederle Date: Mon, 30 Jan 2012 17:21:35 -0800 Subject: [PATCH] Fix multiEdit string concat for LB name --- ui/scripts/network.js | 2 +- ui/scripts/ui/widgets/multiEdit.js | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 8e6486a75d8..57ce0ded8fb 100644 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -1943,7 +1943,7 @@ $.extend(item, { _itemData: lbInstances, _maxLength: { - name: 8 + name: 7 }, sticky: stickyData }); diff --git a/ui/scripts/ui/widgets/multiEdit.js b/ui/scripts/ui/widgets/multiEdit.js index 1fa5f9fb3d7..883ba671973 100644 --- a/ui/scripts/ui/widgets/multiEdit.js +++ b/ui/scripts/ui/widgets/multiEdit.js @@ -93,9 +93,12 @@ $td.append($('').html(start + ' - ' + end)); } else { - if (data['_maxLength'] && - data['_maxLength'][fieldName]) { - $td.append($('').html(data[fieldName].toString().substr(0, data['_maxLength'][fieldName]).concat('...'))); + var maxLengths = data['_maxLength']; + + if (maxLengths && + maxLengths[fieldName] && + data[fieldName].length >= maxLengths[fieldName]) { + $td.append($('').html(data[fieldName].toString().substr(0, maxLengths[fieldName] - 3).concat('...'))); } else { $td.append($('').html(data[fieldName])); }