From c237e0a9609c6dabb2b570e219ff0d43075faabd Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Sun, 8 Jul 2012 15:20:18 -0700 Subject: [PATCH] cloudstack 3.0 UI - VPC section - rename context.tiers to context.networks to be consistent with Guest Network section. --- ui/scripts/ui-custom/vpc.js | 4 ++-- ui/scripts/vpc.js | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ui/scripts/ui-custom/vpc.js b/ui/scripts/ui-custom/vpc.js index a786fa9636f..767e089b710 100644 --- a/ui/scripts/ui-custom/vpc.js +++ b/ui/scripts/ui-custom/vpc.js @@ -290,7 +290,7 @@ actions: actions, actionPreFilter: actionPreFilter, context: $.extend(true, {}, context, { - tiers: [tier] + networks: [tier] }) }); @@ -505,7 +505,7 @@ $loading.remove(); addNewTier({ context: $.extend(true, {}, context, { - tiers: [tier] + networks: [tier] }), tier: tier, $tiers: $tiers, diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js index 81618ca8ca7..33e850edbb0 100644 --- a/ui/scripts/vpc.js +++ b/ui/scripts/vpc.js @@ -72,7 +72,7 @@ $.ajax({ url: createURL('createNetworkACL'), data: $.extend(args.data, { - networkid: args.context.tiers[0].id + networkid: args.context.networks[0].id }), dataType: 'json', success: function(data) { @@ -127,7 +127,7 @@ url: createURL('listNetworkACLs'), data: { listAll: true, - networkid: args.context.tiers[0].id + networkid: args.context.networks[0].id }, dataType: 'json', async: true, @@ -392,7 +392,7 @@ $.ajax({ url: createURL('listVirtualMachines' + array1.join("")), data: { - networkid: args.context.tiers[0].id + networkid: args.context.networks[0].id }, success: function(json) { args.response.success({ @@ -872,7 +872,7 @@ tiers: { actionPreFilter: function(args) { - var tier = args.context.tiers[0]; + var tier = args.context.networks[0]; var state = tier.state; return state == 'Running' ? ['start'] : ['stop']; @@ -1009,7 +1009,7 @@ url: createURL('deleteNetwork'), dataType: "json", data: { - id: args.context.tiers[0].id + id: args.context.networks[0].id }, success: function(json) { var jid = json.deletenetworkresponse.jobid;