Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0030110507 for ; Tue, 30 Apr 2013 19:20:30 +0000 (UTC) Received: (qmail 33719 invoked by uid 500); 30 Apr 2013 19:20:24 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 33658 invoked by uid 500); 30 Apr 2013 19:20:24 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 33310 invoked by uid 99); 30 Apr 2013 19:20:24 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Apr 2013 19:20:24 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0E57688469E; Tue, 30 Apr 2013 19:20:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bfederle@apache.org To: commits@cloudstack.apache.org Date: Tue, 30 Apr 2013 19:20:37 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [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 Authored: Fri Apr 26 12:37:08 2013 -0700 Committer: Brian Federle 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')) {