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 47DAF1058B for ; Tue, 20 Aug 2013 22:36:08 +0000 (UTC) Received: (qmail 72609 invoked by uid 500); 20 Aug 2013 22:36:08 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 72588 invoked by uid 500); 20 Aug 2013 22:36:08 -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 72581 invoked by uid 99); 20 Aug 2013 22:36:08 -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, 20 Aug 2013 22:36:08 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id DCBB08C11A4; Tue, 20 Aug 2013 22:36:07 +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 84228c2 Date: Tue, 20 Aug 2013 22:36:07 +0000 (UTC) Updated Branches: refs/heads/master d5e55ba2a -> 84228c2c6 CLOUDSTACK-3950: UI > set g_regionsecondaryenabled to true after adding region-wide secondary storage. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/84228c2c Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/84228c2c Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/84228c2c Branch: refs/heads/master Commit: 84228c2c609129db4bf765db2fae22a4158f8c33 Parents: d5e55ba Author: Jessica Wang Authored: Tue Aug 20 15:35:09 2013 -0700 Committer: Jessica Wang Committed: Tue Aug 20 15:35:56 2013 -0700 ---------------------------------------------------------------------- ui/scripts/system.js | 6 ++++++ ui/scripts/zoneWizard.js | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84228c2c/ui/scripts/system.js ---------------------------------------------------------------------- diff --git a/ui/scripts/system.js b/ui/scripts/system.js index 197a15d..32944d6 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -14545,6 +14545,9 @@ data: data, success: function(json) { havingS3 = true; + + g_regionsecondaryenabled = true; + var item = json.addimagestoreresponse.imagestore; args.response.success({ data: item @@ -14605,6 +14608,9 @@ data: data, success: function(json) { havingSwift = true; + + g_regionsecondaryenabled = true; + var item = json.addimagestoreresponse.imagestore; args.response.success({ data: item http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84228c2c/ui/scripts/zoneWizard.js ---------------------------------------------------------------------- diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js index c8c45c0..02a68db 100755 --- a/ui/scripts/zoneWizard.js +++ b/ui/scripts/zoneWizard.js @@ -4113,7 +4113,9 @@ $.ajax({ url: createURL('addImageStore'), data: data, - success: function(json) { + success: function(json) { + g_regionsecondaryenabled = true; + complete({ data: $.extend(args.data, { returnedSecondaryStorage: json.addimagestoreresponse.secondarystorage @@ -4181,7 +4183,9 @@ $.ajax({ url: createURL('addImageStore'), data: data, - success: function(json) { + success: function(json) { + g_regionsecondaryenabled = true; + complete({ data: $.extend(args.data, { returnedSecondaryStorage: json.addimagestoreresponse.secondarystorage