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 B885E104FC for ; Mon, 19 Aug 2013 18:40:02 +0000 (UTC) Received: (qmail 43161 invoked by uid 500); 19 Aug 2013 18:40:02 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 43141 invoked by uid 500); 19 Aug 2013 18:40: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 43129 invoked by uid 99); 19 Aug 2013 18:40: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; Mon, 19 Aug 2013 18:40:02 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 047188BFC16; Mon, 19 Aug 2013 18:40:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jessicawang@apache.org To: commits@cloudstack.apache.org Message-Id: <1a6034dc6c0141f7a30dfb366bcd825e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 9064acb Date: Mon, 19 Aug 2013 18:40:02 +0000 (UTC) Updated Branches: refs/heads/master 1f69ad115 -> 9064acbb0 CLOUDSTACK-3464: UI > VPC > Router > Public IP Addresses > detailView - fix associated network name. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9064acbb Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9064acbb Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9064acbb Branch: refs/heads/master Commit: 9064acbb075f3062195502fb8720863d1ac38070 Parents: 1f69ad1 Author: Jessica Wang Authored: Mon Aug 19 11:34:40 2013 -0700 Committer: Jessica Wang Committed: Mon Aug 19 11:39:52 2013 -0700 ---------------------------------------------------------------------- ui/scripts/network.js | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9064acbb/ui/scripts/network.js ---------------------------------------------------------------------- diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 568c0a5..5c57cc4 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -2575,10 +2575,10 @@ }, associatednetworkid: { label: 'label.associated.network.id' - }, - networkname: { - label: 'label.associated.network' - }, + }, + associatednetworkname: { + label: 'label.network.name' + }, state: { label: 'label.state' }, @@ -2645,9 +2645,7 @@ args.response.success({ actionFilter: actionFilters.ipAddress, - data: $.extend(ipObj, { - networkname: network ? network.name : '' - }) + data: ipObj }); }, error: function(data) {