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 C30B9F358 for ; Thu, 9 May 2013 18:00:41 +0000 (UTC) Received: (qmail 60444 invoked by uid 500); 9 May 2013 18:00:40 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 60342 invoked by uid 500); 9 May 2013 18:00:40 -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 60274 invoked by uid 99); 9 May 2013 18:00:40 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 May 2013 18:00:40 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C8C2388A9EB; Thu, 9 May 2013 18:00:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: alena1108@apache.org To: commits@cloudstack.apache.org Date: Thu, 09 May 2013 18:00:42 -0000 Message-Id: <99b583fcb5b94df596921dbf53d64343@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [4/9] git commit: updated refs/heads/internallb to def0861 CLOUDSTACK-2413 - Display the Name of compute offering in dialog box Change Service Offering (was Description field before) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2e1877af Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2e1877af Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2e1877af Branch: refs/heads/internallb Commit: 2e1877af33a49d4d18d3e024abca16b3d72dbf4e Parents: 600f140 Author: Milamber Authored: Thu May 9 10:46:05 2013 +0100 Committer: Milamber Committed: Thu May 9 10:50:04 2013 +0100 ---------------------------------------------------------------------- ui/scripts/instances.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2e1877af/ui/scripts/instances.js ---------------------------------------------------------------------- diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index e5d7d14..c76d843 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -934,7 +934,7 @@ var serviceofferings = json.listserviceofferingsresponse.serviceoffering; var items = []; $(serviceofferings).each(function() { - items.push({id: this.id, description: this.displaytext}); + items.push({id: this.id, description: this.name}); }); args.response.success({data: items}); }