From a7908b63bd035e905dc8bc4b3329e6d5c80f075f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 24 Jan 2014 15:59:23 +0100 Subject: [PATCH] [FIX] payment_*: fixed return controlers, now using werkzeug redirection bzr revid: tde@openerp.com-20140124145923-fsyv2tm5z92m1je1 --- addons/payment_adyen/controllers/main.py | 9 +++++---- addons/payment_ogone/controllers/main.py | 3 ++- addons/payment_paypal/controllers/main.py | 5 +++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/addons/payment_adyen/controllers/main.py b/addons/payment_adyen/controllers/main.py index 8407b8d64d7..6c456d9f0cf 100644 --- a/addons/payment_adyen/controllers/main.py +++ b/addons/payment_adyen/controllers/main.py @@ -1,14 +1,15 @@ # -*- coding: utf-8 -*- -from openerp.addons.web import http -from openerp.addons.web.http import request - try: import simplejson as json except ImportError: import json import logging import pprint +import werkzeug + +from openerp.addons.web import http +from openerp.addons.web.http import request _logger = logging.getLogger(__name__) @@ -28,4 +29,4 @@ class AdyenController(http.Controller): if not return_url: custom = json.loads(post.pop('merchantReturnData', '{}')) return_url = custom.pop('return_url', '/') - return request.redirect(return_url) + return werkzeug.utils.redirect(return_url) diff --git a/addons/payment_ogone/controllers/main.py b/addons/payment_ogone/controllers/main.py index fd765b2b46e..75194b33059 100644 --- a/addons/payment_ogone/controllers/main.py +++ b/addons/payment_ogone/controllers/main.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- import logging import pprint +import werkzeug from openerp.addons.web import http from openerp.addons.web.http import request @@ -25,4 +26,4 @@ class OgoneController(http.Controller): _logger.info('Ogone: entering form_feedback with post data %s', pprint.pformat(post)) # debug cr, uid, context = request.cr, request.uid, request.context request.registry['payment.transaction'].form_feedback(cr, uid, post, 'ogone', context=context) - return request.redirect(post.pop('return_url', '/')) + return werkzeug.utils.redirect(post.pop('return_url', '/')) diff --git a/addons/payment_paypal/controllers/main.py b/addons/payment_paypal/controllers/main.py index cfbf6644890..e6347f2a51f 100644 --- a/addons/payment_paypal/controllers/main.py +++ b/addons/payment_paypal/controllers/main.py @@ -8,6 +8,7 @@ import logging import pprint import urllib import urllib2 +import werkzeug from openerp.addons.web import http from openerp.addons.web.http import request @@ -66,7 +67,7 @@ class PaypalController(http.Controller): _logger.info('Beginning Paypal DPN form_feedback with post data %s', pprint.pformat(post)) # debug return_url = self._get_return_url(**post) self.paypal_validate_data(**post) - return request.redirect(return_url) + return werkzeug.utils.redirect(return_url) @http.route('/payment/paypal/cancel', type='http', auth="admin") def paypal_cancel(self, **post): @@ -74,4 +75,4 @@ class PaypalController(http.Controller): cr, uid, context = request.cr, request.uid, request.context _logger.info('Beginning Paypal cancel with post data %s', pprint.pformat(post)) # debug return_url = self._get_return_url(**post) - return request.redirect(return_url) + return werkzeug.utils.redirect(return_url)