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 BFCE211BDE for ; Tue, 26 Aug 2014 21:05:00 +0000 (UTC) Received: (qmail 49846 invoked by uid 500); 26 Aug 2014 21:05:00 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 49812 invoked by uid 500); 26 Aug 2014 21:05:00 -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 49803 invoked by uid 99); 26 Aug 2014 21:05:00 -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, 26 Aug 2014 21:05:00 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 57DB19CEF3A; Tue, 26 Aug 2014 21:05:00 +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: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 5b221c2 Date: Tue, 26 Aug 2014 21:05:00 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/master eee93aef3 -> 5b221c212 CLOUDSTACK-7435: UI > instance page > assign instance to another account > fix an error "TypeError: json.virtualmachine is undefined [Break On This Error] var item = json.virtualmachine.virtualmachine;" that showed after the action is clicked. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5b221c21 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5b221c21 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5b221c21 Branch: refs/heads/master Commit: 5b221c21265f425bc37cbd5fcfd9ec58ba5bda43 Parents: eee93ae Author: Jessica Wang Authored: Tue Aug 26 14:01:44 2014 -0700 Committer: Jessica Wang Committed: Tue Aug 26 14:04:43 2014 -0700 ---------------------------------------------------------------------- ui/scripts/instances.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5b221c21/ui/scripts/instances.js ---------------------------------------------------------------------- diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index 4d250ef..d3eb2a4 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -1629,14 +1629,14 @@ }, action: function(args) { $.ajax({ - url: createURL('assignVirtualMachine&virtualmachine'), + url: createURL('assignVirtualMachine'), data: { virtualmachineid: args.context.instances[0].id, domainid: args.data.domainid, account: args.data.account }, success: function(json) { - var item = json.virtualmachine.virtualmachine; + var item = json.assignvirtualmachineresponse.virtualmachine; args.response.success({ data: item });