Updated Branches: refs/heads/master 808a3d75d -> 2fe2a0e2f
Fix missing actionFilter causing instance wizard to never complete Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/2fe2a0e2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/2fe2a0e2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/2fe2a0e2 Branch: refs/heads/master Commit: 2fe2a0e2fba8368e3236667c1fa019854f9d68c3 Parents: 808a3d7 Author: Brian Federle <[email protected]> Authored: Thu Jun 28 12:29:18 2012 -0700 Committer: Brian Federle <[email protected]> Committed: Thu Jun 28 12:30:11 2012 -0700 ---------------------------------------------------------------------- ui/scripts/instanceWizard.js | 2 +- ui/scripts/instances.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2fe2a0e2/ui/scripts/instanceWizard.js ---------------------------------------------------------------------- diff --git a/ui/scripts/instanceWizard.js b/ui/scripts/instanceWizard.js index 8559477..a223bc5 100644 --- a/ui/scripts/instanceWizard.js +++ b/ui/scripts/instanceWizard.js @@ -486,7 +486,7 @@ return; return item; }, getActionFilter: function() { - return vmActionfilter; + return cloudStack.actionFilter.vmActionFilter; }, getUpdatedItemWhenAsyncJobFails: function() { var item; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2fe2a0e2/ui/scripts/instances.js ---------------------------------------------------------------------- diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index 5e9b3f3..15c8efc 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -1255,7 +1255,7 @@ } }; - var vmActionfilter = function(args) { + var vmActionfilter = cloudStack.actionFilter.vmActionFilter = function(args) { var jsonObj = args.context.item; var allowedActions = [];
