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 58A0F100B6 for ; Tue, 9 Jul 2013 21:31:28 +0000 (UTC) Received: (qmail 38978 invoked by uid 500); 9 Jul 2013 21:31:28 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 38947 invoked by uid 500); 9 Jul 2013 21:31:28 -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 38940 invoked by uid 99); 9 Jul 2013 21:31:28 -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, 09 Jul 2013 21:31:28 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id F3EB4889F74; Tue, 9 Jul 2013 21:31:27 +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: <4e638d51dc504eddbbbd0075e9a13bd4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to bc8f323 Date: Tue, 9 Jul 2013 21:31:27 +0000 (UTC) Updated Branches: refs/heads/master 70c4a97ea -> bc8f32363 CLOUDSTACK-3427: UI > UCS manager > implement addUcsManager API. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bc8f3236 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bc8f3236 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bc8f3236 Branch: refs/heads/master Commit: bc8f32363e3db60ef0dfc87926d9ed0bb18a10c5 Parents: 70c4a97 Author: Jessica Wang Authored: Tue Jul 9 14:30:34 2013 -0700 Committer: Jessica Wang Committed: Tue Jul 9 14:30:34 2013 -0700 ---------------------------------------------------------------------- ui/scripts/system.js | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bc8f3236/ui/scripts/system.js ---------------------------------------------------------------------- diff --git a/ui/scripts/system.js b/ui/scripts/system.js index 009c736..8393c2a 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -13038,21 +13038,18 @@ name: args.data.name }); } - /* + $.ajax({ url: createURL('addUcsManager'), data: data, - success: function(json) { - + success: function(json) { //e.g. json == { "addUcsManagerResponse" : { "ucsmanager" : {"id":"11","name":"ucsmanager","url":"10.223.184.2","zoneid":"2"} } } + var item = json.addUcsManagerResponse.ucsmanager; + args.response.success({ data: item }); }, error: function(data) { args.response.error(parseXMLHttpResponse(data)); } - }); - */ - - args.response.success({data: { id: '85a2ff00-ed42-4a18-8f5f-bb75c9ffd413', name: 'UCS Manager 3', url: '10.196.72.3' }}); - + }); }, notification: {