odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] Rename request.httprequest.session -> request.session 

bzr revid: fme@openerp.com-20140225090506-4rnku48yg7ruvv8p
This commit is contained in:
Fabien Meghazi 2014-02-25 10:05:06 +01:00
parent 956b73998c
commit 2ab61cf001
5 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/website_event_sale/models/sale_order.py
View File

@ -12,7 +12,7 @@ class sale_order_line(osv.osv):
return super(sale_order_line, self)._recalculate_product_values(cr, uid, ids, product_id, context=context) return super(sale_order_line, self)._recalculate_product_values(cr, uid, ids, product_id, context=context)
order_line = self.browse(cr, SUPERUSER_ID, ids[0], context=context) order_line = self.browse(cr, SUPERUSER_ID, ids[0], context=context)
assert order_line.order_id.website_session_id == request.httprequest.session['website_session_id'] assert order_line.order_id.website_session_id == request.session['website_session_id']
product = product_id and self.pool.get('product.product').browse(cr, uid, product_id, context=context) or order_line.product_id product = product_id and self.pool.get('product.product').browse(cr, uid, product_id, context=context) or order_line.product_id
res = super(sale_order_line, self)._recalculate_product_values(cr, uid, ids, product.id, context=context) res = super(sale_order_line, self)._recalculate_product_values(cr, uid, ids, product.id, context=context)

5
addons/website_quote/controllers/main.py
View File

@ -22,7 +22,6 @@
from openerp import SUPERUSER_ID from openerp import SUPERUSER_ID
from openerp.addons.web import http from openerp.addons.web import http
from openerp.addons.web.http import request from openerp.addons.web.http import request
from openerp.addons.website.models import website
import werkzeug import werkzeug
import datetime import datetime
import time import time
@ -43,8 +42,8 @@ class sale_quote(http.Controller):
if token != order.access_token: if token != order.access_token:
return request.website.render('website.404') return request.website.render('website.404')
# Log only once a day # Log only once a day
if request.httprequest.session.get('view_quote',False)!=now: if request.session.get('view_quote',False)!=now:
request.httprequest.session['view_quote'] = now request.session['view_quote'] = now
body=_('Quotation viewed by customer') body=_('Quotation viewed by customer')
self.__message_post(body, order_id, type='comment') self.__message_post(body, order_id, type='comment')
days = 0 days = 0

8
addons/website_sale/controllers/main.py
View File

@ -639,7 +639,7 @@ class Ecommerce(http.Controller):
'reference': order.name, 'reference': order.name,
'sale_order_id': order.id, 'sale_order_id': order.id,
}, context=context) }, context=context)
request.httprequest.session['website_sale_transaction_id'] = tx_id request.session['website_sale_transaction_id'] = tx_id
elif tx and tx.state == 'draft': # button cliked but no more info -> rewrite on tx or create a new one ? elif tx and tx.state == 'draft': # button cliked but no more info -> rewrite on tx or create a new one ?
tx.write({ tx.write({
'acquirer_id': acquirer_id, 'acquirer_id': acquirer_id,
@ -654,7 +654,7 @@ class Ecommerce(http.Controller):
cr, uid, context = request.cr, request.uid, request.context cr, uid, context = request.cr, request.uid, request.context
order = request.registry['sale.order'].browse(cr, SUPERUSER_ID, sale_order_id, context=context) order = request.registry['sale.order'].browse(cr, SUPERUSER_ID, sale_order_id, context=context)
assert order.website_session_id == request.httprequest.session['website_session_id'] assert order.website_session_id == request.session['website_session_id']
if not order: if not order:
return { return {
@ -717,7 +717,7 @@ class Ecommerce(http.Controller):
order = self.get_order() order = self.get_order()
else: else:
order = request.registry['sale.order'].browse(cr, SUPERUSER_ID, sale_order_id, context=context) order = request.registry['sale.order'].browse(cr, SUPERUSER_ID, sale_order_id, context=context)
assert order.website_session_id == request.httprequest.session['website_session_id'] assert order.website_session_id == request.session['website_session_id']
if not tx or not order: if not tx or not order:
return request.redirect('/shop/') return request.redirect('/shop/')
@ -751,7 +751,7 @@ class Ecommerce(http.Controller):
cr, uid, context = request.cr, request.uid, request.context cr, uid, context = request.cr, request.uid, request.context
order = request.registry['sale.order'].browse(cr, SUPERUSER_ID, sale_order_id, context=context) order = request.registry['sale.order'].browse(cr, SUPERUSER_ID, sale_order_id, context=context)
assert order.website_session_id == request.httprequest.session['website_session_id'] assert order.website_session_id == request.session['website_session_id']
request.registry['website']._ecommerce_change_pricelist(cr, uid, None, context=context or {}) request.registry['website']._ecommerce_change_pricelist(cr, uid, None, context=context or {})

2
addons/website_sale/models/sale_order.py
View File

@ -38,7 +38,7 @@ class SaleOrderLine(osv.Model):
if ids and not product_id: if ids and not product_id:
order_line = self.browse(cr, SUPERUSER_ID, ids[0], context=context) order_line = self.browse(cr, SUPERUSER_ID, ids[0], context=context)
assert order_line.order_id.website_session_id == request.httprequest.session['website_session_id'] assert order_line.order_id.website_session_id == request.session['website_session_id']
product_id = product_id or order_line.product_id.id product_id = product_id or order_line.product_id.id
return self.product_id_change( return self.product_id_change(

38
addons/website_sale/models/website.py
View File

@ -22,12 +22,12 @@ class Website(orm.Model):
# *********************************************************** # ***********************************************************
def ecommerce_get_pricelist_id(self, cr, uid, ids, context=None): def ecommerce_get_pricelist_id(self, cr, uid, ids, context=None):
if not request.httprequest.session.get('ecommerce_pricelist'): if not request.session.get('ecommerce_pricelist'):
self._ecommerce_change_pricelist(cr, uid, None, context=context) self._ecommerce_change_pricelist(cr, uid, None, context=context)
return request.httprequest.session.get('ecommerce_pricelist') return request.session.get('ecommerce_pricelist')
def _ecommerce_change_pricelist(self, cr, uid, code=None, context=None): def _ecommerce_change_pricelist(self, cr, uid, code=None, context=None):
request.httprequest.session.setdefault('ecommerce_pricelist', False) request.session.setdefault('ecommerce_pricelist', False)
pricelist_id = False pricelist_id = False
if code: if code:
@ -40,7 +40,7 @@ class Website(orm.Model):
partner_id = self.pool.get('res.users').browse(cr, SUPERUSER_ID, uid, context).partner_id.id partner_id = self.pool.get('res.users').browse(cr, SUPERUSER_ID, uid, context).partner_id.id
pricelist_id = self.pool.get('sale.order').onchange_partner_id(cr, SUPERUSER_ID, [], partner_id, context=context)['value']['pricelist_id'] pricelist_id = self.pool.get('sale.order').onchange_partner_id(cr, SUPERUSER_ID, [], partner_id, context=context)['value']['pricelist_id']
request.httprequest.session['ecommerce_pricelist'] = pricelist_id request.session['ecommerce_pricelist'] = pricelist_id
order = self.ecommerce_get_current_order(cr, uid, context=context) order = self.ecommerce_get_current_order(cr, uid, context=context)
if order: if order:
@ -134,11 +134,11 @@ class Website(orm.Model):
SaleOrder = self.pool.get('sale.order') SaleOrder = self.pool.get('sale.order')
fields = [k for k, v in SaleOrder._columns.items()] fields = [k for k, v in SaleOrder._columns.items()]
values = SaleOrder.default_get(cr, SUPERUSER_ID, fields, context=context) values = SaleOrder.default_get(cr, SUPERUSER_ID, fields, context=context)
if request.httprequest.session.get('ecommerce_pricelist'): if request.session.get('ecommerce_pricelist'):
values['pricelist_id'] = request.httprequest.session['ecommerce_pricelist'] values['pricelist_id'] = request.session['ecommerce_pricelist']
values['partner_id'] = self.pool.get('res.users').browse(cr, SUPERUSER_ID, uid, context=context).partner_id.id values['partner_id'] = self.pool.get('res.users').browse(cr, SUPERUSER_ID, uid, context=context).partner_id.id
values.update(SaleOrder.onchange_partner_id(cr, SUPERUSER_ID, [], values['partner_id'], context=context)['value']) values.update(SaleOrder.onchange_partner_id(cr, SUPERUSER_ID, [], values['partner_id'], context=context)['value'])
values['website_session_id'] = request.httprequest.session['website_session_id'] values['website_session_id'] = request.session['website_session_id']
return values return values
def _ecommerce_create_quotation(self, cr, uid, context=None): def _ecommerce_create_quotation(self, cr, uid, context=None):
@ -154,30 +154,30 @@ class Website(orm.Model):
SaleOrder = self.pool.get('sale.order') SaleOrder = self.pool.get('sale.order')
# add website_session_id key for access rules # add website_session_id key for access rules
if not request.httprequest.session.get('website_session_id'): if not request.session.get('website_session_id'):
request.httprequest.session['website_session_id'] = str(uuid.uuid4()) request.session['website_session_id'] = str(uuid.uuid4())
order_id = self._ecommerce_create_quotation(cr, uid, context=context) order_id = self._ecommerce_create_quotation(cr, uid, context=context)
request.httprequest.session['ecommerce_order_id'] = order_id request.session['ecommerce_order_id'] = order_id
context = dict(context or {}, pricelist=self.ecommerce_get_pricelist_id(cr, uid, None, context=context)) context = dict(context or {}, pricelist=self.ecommerce_get_pricelist_id(cr, uid, None, context=context))
return SaleOrder.browse(cr, SUPERUSER_ID, order_id, context=context) return SaleOrder.browse(cr, SUPERUSER_ID, order_id, context=context)
def ecommerce_get_current_order(self, cr, uid, context=None): def ecommerce_get_current_order(self, cr, uid, context=None):
SaleOrder = self.pool.get('sale.order') SaleOrder = self.pool.get('sale.order')
context = dict(context or {}, pricelist=self.ecommerce_get_pricelist_id(cr, uid, None, context=context)) context = dict(context or {}, pricelist=self.ecommerce_get_pricelist_id(cr, uid, None, context=context))
order_id = request.httprequest.session.get('ecommerce_order_id') order_id = request.session.get('ecommerce_order_id')
if not order_id: if not order_id:
request.httprequest.session['ecommerce_order_id'] = False request.session['ecommerce_order_id'] = False
return False return False
if not order_id in SaleOrder.exists(cr, uid, [order_id], context=context): if not order_id in SaleOrder.exists(cr, uid, [order_id], context=context):
request.httprequest.session['ecommerce_order_id'] = False request.session['ecommerce_order_id'] = False
return False return False
try: try:
order = SaleOrder.browse(cr, SUPERUSER_ID, order_id, context=context) order = SaleOrder.browse(cr, SUPERUSER_ID, order_id, context=context)
assert order.website_session_id == request.httprequest.session['website_session_id'] assert order.website_session_id == request.session['website_session_id']
return order return order
except: except:
request.httprequest.session['ecommerce_order_id'] = False request.session['ecommerce_order_id'] = False
return False return False
# ************************************************************ # ************************************************************
@ -193,15 +193,15 @@ class Website(orm.Model):
return False return False
def ecommerce_get_current_transaction(self, cr, uid, context=None): def ecommerce_get_current_transaction(self, cr, uid, context=None):
if request.httprequest.session.get('website_sale_transaction_id'): if request.session.get('website_sale_transaction_id'):
tx = self._get_transaction(cr, uid, tx_id=request.httprequest.session['website_sale_transaction_id'], context=context) tx = self._get_transaction(cr, uid, tx_id=request.session['website_sale_transaction_id'], context=context)
if not tx: if not tx:
request.httprequest.session['website_sale_transaction_id'] = False request.session['website_sale_transaction_id'] = False
return tx return tx
return False return False
def ecommerce_reset(self, cr, uid, context=None): def ecommerce_reset(self, cr, uid, context=None):
request.httprequest.session.update({ request.session.update({
'ecommerce_order_id': False, 'ecommerce_order_id': False,
'ecommerce_pricelist': False, 'ecommerce_pricelist': False,
'website_sale_transaction_id': False, 'website_sale_transaction_id': False,