From 0abda1bfd1d8a92f50f695c706cc035cd1f53778 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Tue, 27 Mar 2018 10:47:36 +0200
Subject: [PATCH] Do not launch preference actions when reload menu and context

Such reload can happen when the user is already logged in but those actions
should only run at login.

issue7260
review40231002
---
 src/sao.js    | 8 ++++++++
 src/screen.js | 9 +++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/sao.js b/src/sao.js
index 04da42c6c4..1242e9efe9 100644
--- a/src/sao.js
+++ b/src/sao.js
@@ -432,6 +432,14 @@ var Sao = {};
     };
 
     Sao.menu = function(preferences) {
+        if (!preferences) {
+            var session = Sao.Session.current_session;
+            Sao.rpc({
+                'method': 'model.res.user.get_preferences',
+                'params': [false, {}],
+            }, session).then(Sao.menu);
+            return;
+        }
         var decoder = new Sao.PYSON.Decoder();
         var action = decoder.decode(preferences.pyson_menu);
         var view_ids = false;
diff --git a/src/screen.js b/src/screen.js
index 57460f3f49..e28ad63f05 100644
--- a/src/screen.js
+++ b/src/screen.js
@@ -1696,11 +1696,12 @@
                     this.search_filter();
                 }
             } else if (action == 'reload menu') {
-                Sao.get_preferences().then(function(preferences) {
-                    Sao.menu(preferences);
-                });
+                Sao.Session.current_session.reload_context()
+                    .then(function() {
+                        Sao.menu();
+                    });
             } else if (action == 'reload context') {
-                Sao.get_preferences();
+                Sao.Session.current_session.reload_context();
             }
         },
         save_tree_state: function(store) {