From ad9a322a7654f90c6cd9a57adfcc7df48ea46d92 Mon Sep 17 00:00:00 2001 From: Samuel Degueldre Date: Tue, 8 Jun 2021 16:12:02 +0200 Subject: [PATCH] [IMP] web, iap: introduce odoo.info.isEnterprise and use it --- addons/iap/static/src/js/insufficient_credit_error_handler.js | 2 +- addons/web/static/src/start.js | 1 + addons/web/static/src/webclient/clickbot/clickbot.js | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/iap/static/src/js/insufficient_credit_error_handler.js b/addons/iap/static/src/js/insufficient_credit_error_handler.js index 7a868009099..0303638265b 100644 --- a/addons/iap/static/src/js/insufficient_credit_error_handler.js +++ b/addons/iap/static/src/js/insufficient_credit_error_handler.js @@ -19,7 +19,7 @@ class InsufficientCreditDialog extends Dialog { }); this.style = errorData.body ? "padding:0;" : ""; const { _t } = this.env; - const isEnterprise = _.last(odoo.info.server_version_info) === "e"; + const { isEnterprise } = odoo.info; if (errorData.trial && isEnterprise) { this.buttonMessage = _t("Start a Trial at Odoo"); } else { diff --git a/addons/web/static/src/start.js b/addons/web/static/src/start.js index 95b0a26fe02..237361c5eeb 100644 --- a/addons/web/static/src/start.js +++ b/addons/web/static/src/start.js @@ -23,6 +23,7 @@ export async function startWebClient(Webclient) { db: sessionInfo.db, server_version: sessionInfo.server_version, server_version_info: sessionInfo.server_version_info, + isEnterprise: sessionInfo.server_version_info.slice(-1)[0] === "e", }; odoo.isReady = false; diff --git a/addons/web/static/src/webclient/clickbot/clickbot.js b/addons/web/static/src/webclient/clickbot/clickbot.js index a428af22b4f..c36e698b89b 100644 --- a/addons/web/static/src/webclient/clickbot/clickbot.js +++ b/addons/web/static/src/webclient/clickbot/clickbot.js @@ -15,7 +15,7 @@ 'payment_odoo.menu_adyen_account', ]; - const isEnterprise = odoo.session_info.server_version_info[5] === "e"; + const { isEnterprise } = odoo.info; let appsMenusOnly = false; let actionCount = 0; let viewUpdateCount = 0;