Updated Branches: refs/heads/master b1a5ec13c -> 4c6738266
Fix add tier UI Properly pass context for add tier dialog, which broke due to recent changes that requires context to be present, for the action filter. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/4c673826 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/4c673826 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/4c673826 Branch: refs/heads/master Commit: 4c6738266d941696bccff6be3ef086a03dc94c81 Parents: b1a5ec1 Author: Brian Federle <[email protected]> Authored: Thu Jun 28 15:32:18 2012 -0700 Committer: Brian Federle <[email protected]> Committed: Thu Jun 28 15:34:22 2012 -0700 ---------------------------------------------------------------------- ui/scripts/ui-custom/vpc.js | 5 +++++ ui/scripts/vpc.js | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4c673826/ui/scripts/ui-custom/vpc.js ---------------------------------------------------------------------- diff --git a/ui/scripts/ui-custom/vpc.js b/ui/scripts/ui-custom/vpc.js index c728bec..4e60138 100644 --- a/ui/scripts/ui-custom/vpc.js +++ b/ui/scripts/ui-custom/vpc.js @@ -350,7 +350,9 @@ var actions = args.actions; var vmListView = args.vmListView; var actionPreFilter = args.actionPreFilter; + var context = args.context; var tier = $.extend(args.tier, { + context: context, vmListView: vmListView, actions: actions, actionPreFilter: actionPreFilter, @@ -396,6 +398,9 @@ function(args) { $loading.remove(); addNewTier({ + context: $.extend(true, {}, context, { + tiers: [tier] + }), tier: tier, $tiers: $tiers, actions: actions, http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4c673826/ui/scripts/vpc.js ---------------------------------------------------------------------- diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js index e4f13df..7688946 100644 --- a/ui/scripts/vpc.js +++ b/ui/scripts/vpc.js @@ -390,7 +390,8 @@ args.response.success({ data: { name: args.data.name, - cidr: args.data.cidr + cidr: args.data.cidr, + state: 'Stopped' } }); }, 500); @@ -480,7 +481,7 @@ setTimeout(function() { args.response.success({ data: { - tiers: tiers + tiers: [] } }); }, 1000);
