From 56b4bcbdcae4bf61406767e6cf070f354cf6441c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Tue, 19 May 2020 19:32:20 +0200
Subject: [PATCH] Backed out changeset 3fdae12ed04b

---
 CHANGELOG      |  2 --
 src/sao.js     |  1 -
 src/session.js | 33 ++++++++-------------------------
 3 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 4193ae1568..25e61daa8b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,3 @@
-* Keep context in sessionStorage
-* Use existing context for get_preferences
 * Allow changes to editable tree checkboxes without first selecting the line
 
 Version 5.6.0 - 2020-05-04
diff --git a/src/sao.js b/src/sao.js
index ec5ecab96a..14d542d71b 100644
--- a/src/sao.js
+++ b/src/sao.js
@@ -594,7 +594,6 @@ var Sao = {};
             jQuery('#user-logout').empty();
             jQuery('#menu').empty();
             new Sao.Window.Preferences(function() {
-                Sao.Session.current_session.reset_context();
                 Sao.get_preferences().then(function(preferences) {
                     Sao.menu(preferences);
                     Sao.user_menu(preferences);
diff --git a/src/session.js b/src/session.js
index 1dac1cc73b..046ad57ad4 100644
--- a/src/session.js
+++ b/src/session.js
@@ -17,8 +17,9 @@
             this.database = database;
             this.login = login;
             this.restore();
-            this.context = {};
-            this.restore_context();
+            this.context = {
+                client: Sao.Bus.id,
+            };
             if (!Sao.Session.current_session) {
                 Sao.Session.current_session = this;
             }
@@ -81,33 +82,15 @@
         reload_context: function() {
             var args = {
                 'method': 'model.res.user.get_preferences',
-                'params': [true, this.context]
+                'params': [true, {}]
             };
-            this.reset_context();
-            var prm = Sao.rpc(args, this);
-            return prm.then(function(context) {
-                jQuery.extend(this.context, context);
-                this.store_context();
-            }.bind(this));
-        },
-        reset_context: function() {
             this.context = {
                 client: Sao.Bus.id,
             };
-        },
-        restore_context: function() {
-            this.reset_context();
-            var context = sessionStorage.getItem('sao_context_' + this.database);
-            if (context !== null) {
-                jQuery.extend(
-                    this.context, Sao.rpc.convertJSONObject(JSON.parse(context)));
-            }
-        },
-        store_context: function() {
-            var context = jQuery.extend({}, this.context);
-            delete context.client;
-            context = JSON.stringify(Sao.rpc.prepareObject(context));
-            sessionStorage.setItem('sao_context_' + this.database, context);
+            var prm = Sao.rpc(args, this);
+            return prm.then(function(context) {
+                jQuery.extend(this.context, context);
+            }.bind(this));
         },
         restore: function() {
             if (this.database && !this.session) {