You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by je...@apache.org on 2013/09/18 01:38:44 UTC
git commit: updated refs/heads/master to 4f61396
Updated Branches:
refs/heads/master 832db1b39 -> 4f61396c6
CLOUDSTACK-4688: UI > (1) Notifications widget - pollTimer() - error handling - check if args is null before trying to access args.message property (2) sharedFunctions.js - pollAsyncJobResult() - error handling - pass message argument to args.error().
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4f61396c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4f61396c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4f61396c
Branch: refs/heads/master
Commit: 4f61396c6144ccadc20e2a7e5d3db2b708533f41
Parents: 832db1b
Author: Jessica Wang <je...@apache.org>
Authored: Tue Sep 17 16:30:25 2013 -0700
Committer: Jessica Wang <je...@apache.org>
Committed: Tue Sep 17 16:38:33 2013 -0700
----------------------------------------------------------------------
ui/scripts/sharedFunctions.js | 4 +++-
ui/scripts/ui/widgets/notifications.js | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4f61396c/ui/scripts/sharedFunctions.js
----------------------------------------------------------------------
diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js
index fdeb7d1..b6a1c1f 100644
--- a/ui/scripts/sharedFunctions.js
+++ b/ui/scripts/sharedFunctions.js
@@ -107,7 +107,9 @@ var pollAsyncJobResult = function(args) {
}
},
error: function(XMLHttpResponse) {
- args.error();
+ args.error({
+ message: parseXMLHttpResponse(XMLHttpResponse)
+ });
}
});
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4f61396c/ui/scripts/ui/widgets/notifications.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/widgets/notifications.js b/ui/scripts/ui/widgets/notifications.js
index fec64c5..9b7fc4c 100644
--- a/ui/scripts/ui/widgets/notifications.js
+++ b/ui/scripts/ui/widgets/notifications.js
@@ -111,7 +111,7 @@
},
incomplete: function(args) {},
error: function(args) {
- if (args.message) {
+ if (args && args.message) {
cloudStack.dialog.notice({
message: _s(args.message)
});