3
0
Fork 0

[IMP] web_switch_context_warning: black, isort

14.0
Joan Sisquella 2020-03-20 15:43:21 +01:00 committed by hkapatel
parent bb9b0f9118
commit 0c6150bedd
5 changed files with 64 additions and 49 deletions

View File

@ -8,17 +8,10 @@
"category": "web",
"website": "https://github.com/OCA/web",
"license": "AGPL-3",
"author": "Akretion, "
"Odoo Community Association (OCA)",
"depends": [
'web',
],
"data": [
"view/view.xml",
],
"qweb": [
"static/src/xml/switch_context_warning.xml",
],
'installable': True,
"author": "Akretion, " "Odoo Community Association (OCA)",
"depends": ["web"],
"data": ["view/view.xml"],
"qweb": ["static/src/xml/switch_context_warning.xml"],
"installable": True,
"application": False,
}

View File

@ -1,9 +1,9 @@
odoo.define('web_switch_context_warning.widget', function (require) {
'use strict';
odoo.define("web_switch_context_warning.widget", function(require) {
"use strict";
var Widget = require('web.Widget');
var UserMenu = require('web.UserMenu');
var session = require('web.session');
var Widget = require("web.Widget");
var UserMenu = require("web.UserMenu");
var session = require("web.session");
// Show a big banner in the top of the page if the context has been
// changed in another tab or window (in the same browser)
@ -12,13 +12,15 @@ odoo.define('web_switch_context_warning.widget', function (require) {
return;
}
var SwitchCompanyWarningWidget = Widget.extend({
template:'web_switch_context_warning.warningWidget',
template: "web_switch_context_warning.warningWidget",
init: function() {
this._super();
var self = this;
var w = new SharedWorker('/web_switch_context_warning/static/src/js/switch_context_warning_worker.js');
w.port.addEventListener('message', function (msg) {
if (msg.data.type !== 'newCtx') {
var w = new SharedWorker(
"/web_switch_context_warning/static/src/js/switch_context_warning_worker.js"
);
w.port.addEventListener("message", function(msg) {
if (msg.data.type !== "newCtx") {
return;
}
if (msg.data.newCtx === self.generateSignature()) {
@ -39,11 +41,9 @@ odoo.define('web_switch_context_warning.widget', function (require) {
init: function(parent) {
this._super(parent);
var switchCompanyWarning = new SwitchCompanyWarningWidget();
switchCompanyWarning.insertAfter('.o_main_navbar');
switchCompanyWarning.insertAfter(".o_main_navbar");
},
});
return SwitchCompanyWarningWidget;
});

View File

@ -4,7 +4,9 @@
var con = [];
var lastCtx = null;
addEventListener("connect", function (ee) {
addEventListener(
"connect",
function(ee) {
"use strict";
var port = ee.ports[0];
@ -15,9 +17,15 @@ addEventListener("connect", function (ee) {
if (lastCtx && newCtx !== lastCtx) {
con.forEach(function(eport) {
eport.postMessage({type: "newCtx", "newCtx": newCtx, "lastCtx": lastCtx});
eport.postMessage({
type: "newCtx",
newCtx: newCtx,
lastCtx: lastCtx,
});
});
}
lastCtx = newCtx;
};
}, false);
},
false
);

View File

@ -1,9 +1,16 @@
<?xml version="1.0" encoding="UTF-8" ?>
<template>
<t t-name="web_switch_context_warning.warningWidget">
<div class="container-fluid bg-warning" style="text-align: center; display:none;padding-top:20px;padding-bottom:5px">
<h3>You switched to a different user, company or database with another tab or window</h3>
<p><button onclick="location.reload(true);" class="btn">Reload</button> to refresh your session</p>
<div
class="container-fluid bg-warning"
style="text-align: center; display:none;padding-top:20px;padding-bottom:5px"
>
<h3
>You switched to a different user, company or database with another tab or window</h3>
<p><button
onclick="location.reload(true);"
class="btn"
>Reload</button> to refresh your session</p>
</div>
</t>
</template>

View File

@ -1,9 +1,16 @@
<?xml version="1.0" encoding="UTF-8" ?>
<openerp>
<data>
<template id="assets_backend" name="web_switch_context_warning assets" inherit_id="web.assets_backend">
<template
id="assets_backend"
name="web_switch_context_warning assets"
inherit_id="web.assets_backend"
>
<xpath expr="." position="inside">
<script type="text/javascript" src="/web_switch_context_warning/static/src/js/switch_context_warning.js"></script>
<script
type="text/javascript"
src="/web_switch_context_warning/static/src/js/switch_context_warning.js"
/>
</xpath>
</template>
</data>