summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorRaphael Collet <rco@openerp.com>2016-08-16 12:16:29 +0200
committerRaphael Collet <rco@openerp.com>2016-08-31 17:21:57 +0200
commit4033ccc129e5463eb97b5d867a13220c10cd0dc6 (patch)
tree44095c97a3b60db3fb2c8d645f13d0a6cf22d5df /addons
parent92f31b10e43ad6c265a223ae22cb3c3a0feb0c8a (diff)
[REM] openerp.http: discard deprecated methods and properties
Diffstat (limited to 'addons')
-rw-r--r--addons/web/controllers/main.py4
-rw-r--r--addons/web/models/ir_http.py2
-rw-r--r--addons/website_blog/controllers/main.py6
-rw-r--r--addons/website_slides/controllers/main.py2
4 files changed, 7 insertions, 7 deletions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 5be3a1a3ef6..186e9715a8c 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -747,7 +747,7 @@ class Session(http.Controller):
:return: A key identifying the saved action.
:rtype: integer
"""
- return request.httpsession.save_action(the_action)
+ return request.session.save_action(the_action)
@http.route('/web/session/get_session_action', type='json', auth="user")
def get_session_action(self, key):
@@ -760,7 +760,7 @@ class Session(http.Controller):
:return: The saved action or None.
:rtype: anything
"""
- return request.httpsession.get_action(key)
+ return request.session.get_action(key)
@http.route('/web/session/check', type='json', auth="user")
def check(self):
diff --git a/addons/web/models/ir_http.py b/addons/web/models/ir_http.py
index f11798cf123..8d64ab0ad1d 100644
--- a/addons/web/models/ir_http.py
+++ b/addons/web/models/ir_http.py
@@ -23,7 +23,7 @@ class Http(models.AbstractModel):
display_switch_company_menu = user.has_group('base.group_multi_company') and len(user.company_ids) > 1
version_info = odoo.service.common.exp_version()
return {
- "session_id": request.session_id,
+ "session_id": request.session.sid,
"uid": request.session.uid,
"is_admin": request.env.user.has_group('base.group_system'),
"is_superuser": request.env.user._is_superuser(),
diff --git a/addons/website_blog/controllers/main.py b/addons/website_blog/controllers/main.py
index 417f74da2c4..f66e3a4a6aa 100644
--- a/addons/website_blog/controllers/main.py
+++ b/addons/website_blog/controllers/main.py
@@ -247,9 +247,9 @@ class WebsiteBlog(http.Controller):
}
response = request.render("website_blog.blog_post_complete", values)
- request.session[request.session_id] = request.session.get(request.session_id, [])
- if not (blog_post.id in request.session[request.session_id]):
- request.session[request.session_id].append(blog_post.id)
+ request.session[request.session.sid] = request.session.get(request.session.sid, [])
+ if not (blog_post.id in request.session[request.session.sid]):
+ request.session[request.session.sid].append(blog_post.id)
# Increase counter
blog_post.sudo().write({
'visits': blog_post.visits+1,
diff --git a/addons/website_slides/controllers/main.py b/addons/website_slides/controllers/main.py
index a0c3d0cdc49..ed9b374c70c 100644
--- a/addons/website_slides/controllers/main.py
+++ b/addons/website_slides/controllers/main.py
@@ -22,7 +22,7 @@ class WebsiteSlides(http.Controller):
}
def _set_viewed_slide(self, slide, view_mode):
- slide_key = '%s_%s' % (view_mode, request.session_id)
+ slide_key = '%s_%s' % (view_mode, request.session.sid)
viewed_slides = request.session.setdefault(slide_key, list())
if slide.id not in viewed_slides:
if view_mode == 'slide':