cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mc...@apache.org
Subject [28/50] [abbrv] git commit: updated refs/heads/rbac to 3b58a45
Date Fri, 07 Feb 2014 21:46:37 GMT
Detail view UI: Fix embedded list view actions

Fixes case when detail view has an embedded list view with action, that
the action is handled by detail view instead of list view, causing
unexpected behavior


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

Branch: refs/heads/rbac
Commit: c2c7d33d8ec79a2e3fdb4736821e7708b843d658
Parents: a873a0e
Author: Brian Federle <brian.federle@citrix.com>
Authored: Wed Feb 5 11:47:04 2014 -0800
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Wed Feb 5 11:47:04 2014 -0800

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c2c7d33d/ui/scripts/ui/widgets/detailView.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/widgets/detailView.js b/ui/scripts/ui/widgets/detailView.js
index 9ca4ddd..4c5aeea 100644
--- a/ui/scripts/ui/widgets/detailView.js
+++ b/ui/scripts/ui/widgets/detailView.js
@@ -1486,7 +1486,8 @@
         }
 
         // Detail action
-        if ($target.closest('div.detail-view [detail-action], div.detail-view .action.text').size())
{
+        if ($target.closest('div.detail-view [detail-action], div.detail-view .action.text').size()
&&
+            !$target.closest('.list-view').size()) {
             var $action = $target.closest('.action').find('[detail-action]');
             var actionName = $action.attr('detail-action');
             var actionCallback = $action.data('detail-view-action-callback');


Mime
View raw message