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/04/30 21:20:37 UTC
[15/22] git commit: updated refs/heads/master to c7143be
Fix detail view 'add action' for multi-group tab
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b7b7753f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b7b7753f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b7b7753f
Branch: refs/heads/master
Commit: b7b7753f1defeb36af1bc7da878e170b9a7689e7
Parents: 19c9ee8
Author: Brian Federle <br...@citrix.com>
Authored: Fri Apr 26 12:37:08 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Fri Apr 26 12:37:08 2013 -0700
----------------------------------------------------------------------
ui/scripts/ui/widgets/detailView.js | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b7b7753f/ui/scripts/ui/widgets/detailView.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/widgets/detailView.js b/ui/scripts/ui/widgets/detailView.js
index 2b33503..0b16d2d 100644
--- a/ui/scripts/ui/widgets/detailView.js
+++ b/ui/scripts/ui/widgets/detailView.js
@@ -64,7 +64,6 @@
standard: function($detailView, args, additional) {
var tab = args.tabs[args.activeTab];
var isMultiple = tab.multiple;
-
var action = isMultiple ? tab.actions[args.actionName] : args.actions[args.actionName];
var preAction = action.preAction;
var notification = action.notification ?
@@ -999,7 +998,8 @@
$tabContent.html('');
var targetTabID = $tabContent.data('detail-view-tab-id');
- var tabs = args.tabs[targetTabID];
+ var tabList = args.tabs;
+ var tabs = tabList[targetTabID];
var dataProvider = tabs.dataProvider;
var isMultiple = tabs.multiple || tabs.isMultiple;
var viewAllArgs = args.viewAll;
@@ -1111,7 +1111,12 @@
).click(function() {
uiActions.standard(
$detailView,
- { actions: tabData.actions, actionName: 'add' }, {
+ {
+ tabs: tabList,
+ activeTab: targetTabID,
+ actions: tabData.actions,
+ actionName: 'add'
+ }, {
noRefresh: true,
complete: function(args) {
if ($detailView.is(':visible')) {