Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0C780DF33 for ; Tue, 21 Aug 2012 18:33:25 +0000 (UTC) Received: (qmail 64838 invoked by uid 500); 21 Aug 2012 18:33:24 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 64815 invoked by uid 500); 21 Aug 2012 18:33:24 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 64808 invoked by uid 99); 21 Aug 2012 18:33: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, 21 Aug 2012 18:33:24 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5C3961EB06; Tue, 21 Aug 2012 18:33:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bfederle@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: git commit: CS-16007: Show tier name (associated network name) in place of VM name Message-Id: <20120821183324.5C3961EB06@tyr.zones.apache.org> Date: Tue, 21 Aug 2012 18:33:24 +0000 (UTC) Updated Branches: refs/heads/master 3f8d9f6b1 -> 93834ea6c CS-16007: Show tier name (associated network name) in place of VM name reviewed-by: jessica Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/93834ea6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/93834ea6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/93834ea6 Branch: refs/heads/master Commit: 93834ea6c605272aef2e022ed0872c6e884892b3 Parents: 3f8d9f6 Author: Brian Federle Authored: Tue Aug 21 11:31:23 2012 -0700 Committer: Brian Federle Committed: Tue Aug 21 11:33:03 2012 -0700 ---------------------------------------------------------------------- ui/scripts/vpc.js | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/93834ea6/ui/scripts/vpc.js ---------------------------------------------------------------------- diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js index 8bb80d0..6c83cf1 100644 --- a/ui/scripts/vpc.js +++ b/ui/scripts/vpc.js @@ -533,7 +533,16 @@ }, ipAddresses: { listView: function() { - return cloudStack.sections.network.sections.ipAddresses; + var listView = $.extend(true, {}, cloudStack.sections.network.sections.ipAddresses); + + listView.listView.fields = { + ipaddress: listView.listView.fields.ipaddress, + zonename: listView.listView.fields.zonename, + associatednetworkname: { label: 'label.network.name' }, + state: listView.listView.fields.state + }; + + return listView; } }, acl: {