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 5BDF5DF05 for ; Tue, 21 May 2013 19:53:02 +0000 (UTC) Received: (qmail 70418 invoked by uid 500); 21 May 2013 19:53:02 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 70379 invoked by uid 500); 21 May 2013 19:53:02 -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 70371 invoked by uid 99); 21 May 2013 19:53:02 -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, 21 May 2013 19:53:02 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5D5C38916A0; Tue, 21 May 2013 19:53:02 +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 Message-Id: <2548becfe69d46bc9ce5a1a07ee85315@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/ui-vpc-redesign to 451c83c Date: Tue, 21 May 2013 19:53:02 +0000 (UTC) Updated Branches: refs/heads/ui-vpc-redesign e35f14439 -> 451c83c99 Fix listView add/replace row for VPC section Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/451c83c9 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/451c83c9 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/451c83c9 Branch: refs/heads/ui-vpc-redesign Commit: 451c83c998a96f908a04d3329e1dc695c64849e8 Parents: e35f144 Author: Brian Federle Authored: Tue May 21 12:52:55 2013 -0700 Committer: Brian Federle Committed: Tue May 21 12:52:55 2013 -0700 ---------------------------------------------------------------------- ui/scripts/ui/widgets/listView.js | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/451c83c9/ui/scripts/ui/widgets/listView.js ---------------------------------------------------------------------- diff --git a/ui/scripts/ui/widgets/listView.js b/ui/scripts/ui/widgets/listView.js index 0d5ef6fc..031874d 100644 --- a/ui/scripts/ui/widgets/listView.js +++ b/ui/scripts/ui/widgets/listView.js @@ -1873,7 +1873,7 @@ if (!options) options = {}; var viewArgs = listView.data('view-args'); - var listViewArgs = viewArgs.listView ? viewArgs.listView : viewArgs; + var listViewArgs = $.isPlainObject(viewArgs.listView) ? viewArgs.listView : viewArgs; var targetArgs = listViewArgs.activeSection ? listViewArgs.sections[ listViewArgs.activeSection ].listView : listViewArgs; @@ -1903,7 +1903,7 @@ var $newRow; var $listView = $row.closest('.list-view'); var viewArgs = $listView.data('view-args'); - var listViewArgs = viewArgs.listView ? viewArgs.listView : viewArgs; + var listViewArgs = $.isPlainObject(viewArgs.listView) ? viewArgs.listView : viewArgs; var targetArgs = listViewArgs.activeSection ? listViewArgs.sections[ listViewArgs.activeSection ].listView : listViewArgs;