You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2012/06/28 23:21:15 UTC
git commit: Pass _custom correctly to VPC tier add VM action
Updated Branches:
refs/heads/master 6d78cc400 -> 9bbbc4e35
Pass _custom correctly to VPC tier add VM action
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/9bbbc4e3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/9bbbc4e3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/9bbbc4e3
Branch: refs/heads/master
Commit: 9bbbc4e356a8bb24034d99e4f167984c49930107
Parents: 6d78cc4
Author: Brian Federle <br...@citrix.com>
Authored: Thu Jun 28 14:20:17 2012 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Thu Jun 28 14:21:08 2012 -0700
----------------------------------------------------------------------
ui/scripts/ui-custom/vpc.js | 4 +++-
ui/scripts/vpc.js | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9bbbc4e3/ui/scripts/ui-custom/vpc.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/vpc.js b/ui/scripts/ui-custom/vpc.js
index 6b27a4f..0ba70e5 100644
--- a/ui/scripts/ui-custom/vpc.js
+++ b/ui/scripts/ui-custom/vpc.js
@@ -213,12 +213,14 @@
var success = function(args) {
var remove = args ? args.remove : false;
+ var _custom = args ? args._custom : {};
cloudStack.ui.notifications.add(
// Notification
{
desc: label,
- poll: notification.poll
+ poll: notification.poll,
+ _custom: _custom
},
// Success
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9bbbc4e3/ui/scripts/vpc.js
----------------------------------------------------------------------
diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js
index be561a5..94e6dcb 100644
--- a/ui/scripts/vpc.js
+++ b/ui/scripts/vpc.js
@@ -433,7 +433,7 @@
cloudStack.instanceWizard
),
notification: {
- poll: function(args) { args.complete(); }
+ poll: pollAsyncJobResult
}
},
acl: {