From ee22f8857888cb9c1d5e05428b25a1928bb7c3d7 Mon Sep 17 00:00:00 2001 From: Pranav Saxena Date: Wed, 8 Aug 2012 20:14:11 +0530 Subject: [PATCH] CS-15900:InterVlan - UI - Confirmation Note on Acquisition of a Public IP Address to a VPC should mention this VPC instead of this Network --- ui/scripts/network.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ui/scripts/network.js b/ui/scripts/network.js index f6439d32697..2c18a192569 100644 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -153,6 +153,7 @@ }; var networkOfferingObjs = []; + var checkVpc=0; cloudStack.sections.network = { title: 'label.network', @@ -1098,17 +1099,22 @@ preFilter: function(args) { if('networks' in args.context) { //from Guest Network section if(args.context.networks[0].vpcid == null) //if it's a non-VPC network, show Acquire IP button - return true; + checkVpc=0; + return true; else //if it's a VPC network, hide Acquire IP button return false; } else { //from VPC section + checkVpc=1; return true; //show Acquire IP button } }, messages: { confirm: function(args) { - return 'message.acquire.new.ip'; + if(checkVpc == 1) + return 'Please confirm that you would like to acquire a new IP for this VPC'; + else + return 'message.acquire.new.ip'; }, notification: function(args) { return 'label.acquire.new.ip';