From 140768c82b5d6b901239d59700a485620059b07c Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Tue, 17 Jul 2012 15:42:01 -0700 Subject: [PATCH] cloudstack 3.0 UI - multiEdit widget - make headerFields hidden as default. --- ui/scripts/network.js | 10 ++++++---- ui/scripts/ui/widgets/multiEdit.js | 3 ++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 4eb11485631..258f814b548 100644 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -2543,14 +2543,15 @@ $.ajax({ url: createURL('listPublicIpAddresses'), data: { - id: args.context.ipAddresses[0].id + id: args.context.ipAddresses[0].id, + listAll: true }, success: function(json) { var item = json.listpublicipaddressesresponse.publicipaddress[0]; args.context.ipAddresses.shift(); //remove the first element in args.context.ipAddresses args.context.ipAddresses.push(item); - var $headerFields = $multi.find('.header-fields'); + var $headerFields = $multi.find('.header-fields'); if ('vpc' in args.context) { if(args.context.ipAddresses[0].associatednetworkid == null) { $headerFields.show(); @@ -2816,11 +2817,12 @@ }); // Check if tiers are present; hide/show header drop-down (begin) *** - //dataProvider() is called when a LB rule is added in multiEdit. However, adding a LB rule might change parent object (IP Address object). So, we have to force to refresh args.context.ipAddresses[0] here + //dataProvider() is called when a PF rule is added in multiEdit. However, adding a LB rule might change parent object (IP Address object). So, we have to force to refresh args.context.ipAddresses[0] here $.ajax({ url: createURL('listPublicIpAddresses'), data: { - id: args.context.ipAddresses[0].id + id: args.context.ipAddresses[0].id, + listAll: true }, success: function(json) { var item = json.listpublicipaddressesresponse.publicipaddress[0]; diff --git a/ui/scripts/ui/widgets/multiEdit.js b/ui/scripts/ui/widgets/multiEdit.js index e0c15e90ef1..c11e7a63475 100644 --- a/ui/scripts/ui/widgets/multiEdit.js +++ b/ui/scripts/ui/widgets/multiEdit.js @@ -768,7 +768,8 @@ } }) : null; var $headerFields = $('
').addClass('header-fields'); - + $headerFields.hide(); + if (headerForm) { $headerFields.append(headerForm.$formContainer) .prependTo($multi);