Return-Path: X-Original-To: apmail-deltacloud-dev-archive@www.apache.org Delivered-To: apmail-deltacloud-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E4DF2C7B7 for ; Mon, 11 Jun 2012 07:35:02 +0000 (UTC) Received: (qmail 74735 invoked by uid 500); 11 Jun 2012 07:35:02 -0000 Delivered-To: apmail-deltacloud-dev-archive@deltacloud.apache.org Received: (qmail 73544 invoked by uid 500); 11 Jun 2012 07:34:56 -0000 Mailing-List: contact dev-help@deltacloud.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@deltacloud.apache.org Delivered-To: mailing list dev@deltacloud.apache.org Received: (qmail 73450 invoked by uid 99); 11 Jun 2012 07:34:52 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Jun 2012 07:34:52 +0000 X-ASF-Spam-Status: No, hits=-5.0 required=5.0 tests=RCVD_IN_DNSWL_HI,SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of marios@redhat.com designates 209.132.183.28 as permitted sender) Received: from [209.132.183.28] (HELO mx1.redhat.com) (209.132.183.28) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Jun 2012 07:34:43 +0000 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q5B7YLoY013096 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 11 Jun 2012 03:34:21 -0400 Received: from name.redhat.com (ovpn-112-23.ams2.redhat.com [10.36.112.23]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q5B7YHZ1019558 for ; Mon, 11 Jun 2012 03:34:18 -0400 From: marios@redhat.com To: dev@deltacloud.apache.org Subject: [PATCH] Fix redirection to root_url/change drivers/provider via HTML UI Date: Mon, 11 Jun 2012 10:34:16 +0300 Message-Id: <1339400056-30811-1-git-send-email-marios@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 From: marios Signed-off-by: marios --- server/lib/deltacloud/server.rb | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server/lib/deltacloud/server.rb b/server/lib/deltacloud/server.rb index cdb7150..32acb38 100644 --- a/server/lib/deltacloud/server.rb +++ b/server/lib/deltacloud/server.rb @@ -44,7 +44,7 @@ module Deltacloud set :config, Deltacloud[:deltacloud] - get config.root_url + '/?' do + get Deltacloud.config[:deltacloud].root_url + '/?' do if params[:force_auth] return [401, 'Authentication failed'] unless driver.valid_credentials?(credentials) end @@ -55,20 +55,20 @@ module Deltacloud end end - post config.root_url + '/?' do + post Deltacloud.config[:deltacloud].root_url + '/?' do param_driver, param_provider = params["driver"], params["provider"] if param_driver - redirect "#{config.root_url}\;driver=#{param_driver}", 301 + redirect "#{Deltacloud.config[:deltacloud].root_url}\;driver=#{param_driver}", 301 elsif param_provider && param_provider != "default" #FIXME NEEDS A BETTER WAY OF GRABBING CURRENT DRIVER FROM MATRIX PARAMS... current_matrix_driver = env["HTTP_REFERER"].match(/\;(driver)=(\w*).*$/i) if current_matrix_driver - redirect "#{config.root_url}\;driver=#{$2}\;provider=#{param_provider}", 301 + redirect "#{Deltacloud.config[:deltacloud].root_url}\;driver=#{$2}\;provider=#{param_provider}", 301 else - redirect "#{config.root_url}\;provider=#{param_provider}", 301 + redirect "#{Deltacloud.config[:deltacloud].root_url}\;provider=#{param_provider}", 301 end else - redirect "#{config.root_url}", 301 + redirect "#{Deltacloud.config[:deltacloud].root_url}", 301 end end -- 1.7.6.5