[MERGE] from upstream

bzr revid: fva@openerp.com-20130712121148-0ys14v8jc33t6sf5

1 files changed, 16 insertions, 18 deletions

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 846b9099555..d485d58443d 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -362,8 +362,6 @@ def login_and_redirect(db, login, key, redirect_url='/'):
 def set_cookie_and_redirect(redirect_url):
     redirect = werkzeug.utils.redirect(redirect_url, 303)
     redirect.autocorrect_location_header = False
-    cookie_val = urllib2.quote(simplejson.dumps(request.session_id))
-    redirect.set_cookie('instance0|session_id', cookie_val)
     return redirect
 
 def load_actions_from_ir_values(key, key2, models, meta):
@@ -812,16 +810,16 @@ class Session(http.Controller):
         request.session.ensure_valid()
         return {
             "session_id": request.session_id,
-            "uid": request.session._uid,
-            "user_context": request.session.get_context() if request.session._uid else {},
-            "db": request.session._db,
-            "username": request.session._login,
+            "uid": request.session.uid,
+            "user_context": request.session.get_context() if request.session.uid else {},
+            "db": request.session.db,
+            "username": request.session.login,
         }
 
     @http.route('/web/session/get_session_info', type='json', auth="none")
     def get_session_info(self):
-        request.uid = request.session._uid
-        request.db = request.session._db
+        request.uid = request.session.uid
+        request.db = request.session.db
         return self.session_info()
 
     @http.route('/web/session/authenticate', type='json', auth="none")
@@ -855,7 +853,7 @@ class Session(http.Controller):
     @http.route('/web/session/sc_list', type='json', auth="user")
     def sc_list(self):
         return request.session.model('ir.ui.view_sc').get_sc(
-            request.session._uid, "ir.ui.menu", request.context)
+            request.session.uid, "ir.ui.menu", request.context)
 
     @http.route('/web/session/get_lang_list', type='json', auth="none")
     def get_lang_list(self):
@@ -916,7 +914,7 @@ class Session(http.Controller):
 
     @http.route('/web/session/destroy', type='json', auth="user")
     def destroy(self):
-        request.session._suicide = True
+        request.session.logout()
 
 class Menu(http.Controller):
 
@@ -930,7 +928,7 @@ class Menu(http.Controller):
         s = request.session
         Menus = s.model('ir.ui.menu')
         # If a menu action is defined use its domain to get the root menu items
-        user_menu_id = s.model('res.users').read([s._uid], ['menu_id'],
+        user_menu_id = s.model('res.users').read([s.uid], ['menu_id'],
                                                  request.context)[0]['menu_id']
 
         menu_domain = [('parent_id', '=', False)]
@@ -1127,7 +1125,7 @@ class View(http.Controller):
     def add_custom(self, view_id, arch):
         CustomView = request.session.model('ir.ui.view.custom')
         CustomView.create({
-            'user_id': request.session._uid,
+            'user_id': request.session.uid,
             'ref_id': view_id,
             'arch': arch
         }, request.context)
@@ -1136,7 +1134,7 @@ class View(http.Controller):
     @http.route('/web/view/undo_custom', type='json', auth="user")
     def undo_custom(self, view_id, reset=False):
         CustomView = request.session.model('ir.ui.view.custom')
-        vcustom = CustomView.search([('user_id', '=', request.session._uid), ('ref_id' ,'=', view_id)],
+        vcustom = CustomView.search([('user_id', '=', request.session.uid), ('ref_id' ,'=', view_id)],
                                     0, False, False, request.context)
         if vcustom:
             if reset:
@@ -1319,9 +1317,9 @@ class Binary(http.Controller):
     def company_logo(self, dbname=None):
         # TODO add etag, refactor to use /image code for etag
         uid = None
-        if request.session._db:
-            dbname = request.session._db
-            uid = request.session._uid
+        if request.session.db:
+            dbname = request.session.db
+            uid = request.session.uid
         elif dbname is None:
             dbname = db_monodb()
 
@@ -1687,14 +1685,14 @@ class Reports(http.Controller):
             raise ValueError("action['datas']['ids'] and context['active_ids'] are undefined")
 
         report_id = report_srv.report(
-            request.session._db, request.session._uid, request.session._password,
+            request.session.db, request.session.uid, request.session.password,
             action["report_name"], report_ids,
             report_data, context)
 
         report_struct = None
         while True:
             report_struct = report_srv.report_get(
-                request.session._db, request.session._uid, request.session._password, report_id)
+                request.session.db, request.session.uid, request.session.password, report_id)
             if report_struct["state"]:
                 break