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 2013/12/06 21:35:02 UTC

[2/2] git commit: updated refs/heads/4.3 to c00cf19

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/c00cf196
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c00cf196
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c00cf196

Branch: refs/heads/4.3
Commit: c00cf1966216abc3dcb897d408ec27a1cea1700a
Parents: 9768dff
Author: Brian Federle <br...@citrix.com>
Authored: Fri Dec 6 12:33:03 2013 -0800
Committer: Brian Federle <br...@citrix.com>
Committed: Fri Dec 6 12:34:53 2013 -0800

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c00cf196/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,