From 7fda33bbd0c5f9a8017686611d13ea52dd40b6df Mon Sep 17 00:00:00 2001 From: Brian Federle Date: Mon, 22 Oct 2012 16:44:17 -0700 Subject: [PATCH] CS-16572: Fix missing fields when start port == 0 --- ui/scripts/network.js | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/ui/scripts/network.js b/ui/scripts/network.js index d434265e6d4..f1d46ed06c8 100644 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -3647,14 +3647,24 @@ data: $.map( data.listsecuritygroupsresponse.securitygroup[0].egressrule ? data.listsecuritygroupsresponse.securitygroup[0].egressrule : [], + function(elem) { - return { + var elemData = { id: elem.ruleid, protocol: elem.protocol, - startport: elem.startport ? elem.startport : elem.icmptype, - endport: elem.endport ? elem.endport : elem.icmpcode, + startport: elem.startport, + endport: elem.endport, cidr: elem.cidr ? elem.cidr : ''.concat(elem.account, ' - ', elem.securitygroupname) }; + + if (elemData.startport == 0 && elemData.endport) { + elemData.startport = '0'; + } else if (elem.icmptype && elem.icmpcode) { + elemData.startport = elem.icmptype; + elemData.endport = elem.icmpcode; + } + + return elemData; } ) });