cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [1/2] git commit: updated refs/heads/master to d09d218
Date Fri, 06 Dec 2013 20:34:34 GMT
Updated Branches:
  refs/heads/master eb7cd06e1 -> d09d21847


Detail view: Allow passing error with custom action's complete fn


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d09d2184
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d09d2184
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d09d2184

Branch: refs/heads/master
Commit: d09d21847c3f0006dbefd9829afc1bef2789924f
Parents: 9dabad0
Author: Brian Federle <brian.federle@citrix.com>
Authored: Fri Dec 6 12:33:03 2013 -0800
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Fri Dec 6 12:34:31 2013 -0800

----------------------------------------------------------------------
 ui/scripts/ui/widgets/detailView.js | 9 +++++++++
 1 file changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d09d2184/ui/scripts/ui/widgets/detailView.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/widgets/detailView.js b/ui/scripts/ui/widgets/detailView.js
index 38e66ee..d991f2d 100644
--- a/ui/scripts/ui/widgets/detailView.js
+++ b/ui/scripts/ui/widgets/detailView.js
@@ -147,12 +147,21 @@
 
                             var $item = args.$item;
                             var $row = $detailView.data('list-view-row');
+                            var error = args.error;
 
                             notification.desc = messages.notification(args.messageArgs);
                             notification._custom = $.extend(args._custom ? args._custom :
{}, {
                                 $detailView: $detailView
                             });
 
+                            if (error) {
+                                notification.interval = 1;
+                                notification.poll = function(args) {
+                                    cloudStack.dialog.notice({ message: error });
+                                    args.error(error);
+                                }
+                            }
+
                             cloudStack.ui.notifications.add(
                                 notification,
 


Mime
View raw message