Browse Source

[IMP] add user switch detection and rename module

pull/1288/head
Adrià Gil Sorribes 6 years ago
parent
commit
99cdb6069f
  1. 1
      web_switch_company_warning/readme/CONTRIBUTORS.rst
  2. 1
      web_switch_company_warning/readme/DESCRIPTION.rst
  3. 17
      web_switch_context_warning/README.rst
  4. 0
      web_switch_context_warning/__init__.py
  5. 6
      web_switch_context_warning/__manifest__.py
  6. 14
      web_switch_context_warning/i18n/web_switch_company_warning.pot
  7. 2
      web_switch_context_warning/readme/CONTRIBUTORS.rst
  8. 1
      web_switch_context_warning/readme/DESCRIPTION.rst
  9. 0
      web_switch_context_warning/readme/ROADMAP.rst
  10. 0
      web_switch_context_warning/readme/USAGE.rst
  11. 0
      web_switch_context_warning/static/description/icon.png
  12. 15
      web_switch_context_warning/static/description/index.html
  13. 9
      web_switch_context_warning/static/src/js/switch_company_warning.js
  14. 0
      web_switch_context_warning/static/src/js/switch_company_warning_worker.js
  15. 4
      web_switch_context_warning/static/src/xml/switch_company_warning.xml
  16. 4
      web_switch_context_warning/view/view.xml

1
web_switch_company_warning/readme/CONTRIBUTORS.rst

@ -1 +0,0 @@
* Hparfr <https://github.com/hparfr>

1
web_switch_company_warning/readme/DESCRIPTION.rst

@ -1 +0,0 @@
Shows a warning if current company has been switched in another tab or window.

17
web_switch_company_warning/README.rst → web_switch_context_warning/README.rst

@ -1,6 +1,6 @@
=====================================
Multicompany - Switch Company Warning
=====================================
======================
Switch Context Warning
======================
.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! This file is generated by oca-gen-addon-readme !!
@ -14,10 +14,10 @@ Multicompany - Switch Company Warning
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
:alt: License: AGPL-3
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fweb-lightgray.png?logo=github
:target: https://github.com/OCA/web/tree/11.0/web_switch_company_warning
:target: https://github.com/OCA/web/tree/11.0/web_switch_context_warning
:alt: OCA/web
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
:target: https://translation.odoo-community.org/projects/web-11-0/web-11-0-web_switch_company_warning
:target: https://translation.odoo-community.org/projects/web-11-0/web-11-0-web_switch_context_warning
:alt: Translate me on Weblate
.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
:target: https://runbot.odoo-community.org/runbot/162/11.0
@ -25,7 +25,7 @@ Multicompany - Switch Company Warning
|badge1| |badge2| |badge3| |badge4| |badge5|
Shows a warning if current company has been switched in another tab or window.
Shows a warning if current user, company or database have been switched in another tab or window.
**Table of contents**
@ -45,7 +45,7 @@ Bug Tracker
Bugs are tracked on `GitHub Issues <https://github.com/OCA/web/issues>`_.
In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us smashing it by providing a detailed and welcomed
`feedback <https://github.com/OCA/web/issues/new?body=module:%20web_switch_company_warning%0Aversion:%2011.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
`feedback <https://github.com/OCA/web/issues/new?body=module:%20web_switch_context_warning%0Aversion:%2011.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
Do not contact contributors directly about support or help with technical issues.
@ -61,6 +61,7 @@ Contributors
~~~~~~~~~~~~
* Hparfr <https://github.com/hparfr>
* Adria Gil Sorribes <adria.gil@eficent.com>
Maintainers
~~~~~~~~~~~
@ -75,6 +76,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and
promote its widespread use.
This module is part of the `OCA/web <https://github.com/OCA/web/tree/11.0/web_switch_company_warning>`_ project on GitHub.
This module is part of the `OCA/web <https://github.com/OCA/web/tree/11.0/web_switch_context_warning>`_ project on GitHub.
You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

0
web_switch_company_warning/__init__.py → web_switch_context_warning/__init__.py

6
web_switch_company_warning/__manifest__.py → web_switch_context_warning/__manifest__.py

@ -1,9 +1,9 @@
# Copyright 2017 Akretion <raphael.reverdy@akretion.com>
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
{
"name": "Multicompany - Switch Company Warning",
"summary": "Show a warning if current company has been switched"
" in another tab or window.",
"name": "Switch Context Warning",
"summary": "Show a warning if current user, company or database "
"have been switched in another tab or window.",
"version": "11.0.1.0.0",
"category": "web",
"website": "https://github.com/OCA/web",

14
web_switch_company_warning/i18n/web_switch_company_warning.pot → web_switch_context_warning/i18n/web_switch_company_warning.pot

@ -1,6 +1,6 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * web_switch_company_warning
# * web_switch_context_warning
#
msgid ""
msgstr ""
@ -13,23 +13,23 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
#. module: web_switch_company_warning
#. module: web_switch_context_warning
#. openerp-web
#: code:addons/web_switch_company_warning/static/src/xml/switch_company_warning.xml:6
#: code:addons/web_switch_context_warning/static/src/xml/switch_company_warning.xml:6
#, python-format
msgid "Reload"
msgstr ""
#. module: web_switch_company_warning
#. module: web_switch_context_warning
#. openerp-web
#: code:addons/web_switch_company_warning/static/src/xml/switch_company_warning.xml:5
#: code:addons/web_switch_context_warning/static/src/xml/switch_company_warning.xml:5
#, python-format
msgid "You switched to a different company or database with another tab or window"
msgstr ""
#. module: web_switch_company_warning
#. module: web_switch_context_warning
#. openerp-web
#: code:addons/web_switch_company_warning/static/src/xml/switch_company_warning.xml:6
#: code:addons/web_switch_context_warning/static/src/xml/switch_company_warning.xml:6
#, python-format
msgid "to refresh your session"
msgstr ""

2
web_switch_context_warning/readme/CONTRIBUTORS.rst

@ -0,0 +1,2 @@
* Hparfr <https://github.com/hparfr>
* Adria Gil Sorribes <adria.gil@eficent.com>

1
web_switch_context_warning/readme/DESCRIPTION.rst

@ -0,0 +1 @@
Shows a warning if current user, company or database have been switched in another tab or window.

0
web_switch_company_warning/readme/ROADMAP.rst → web_switch_context_warning/readme/ROADMAP.rst

0
web_switch_company_warning/readme/USAGE.rst → web_switch_context_warning/readme/USAGE.rst

0
web_switch_company_warning/static/description/icon.png → web_switch_context_warning/static/description/icon.png

Before

Width: 128  |  Height: 128  |  Size: 9.2 KiB

After

Width: 128  |  Height: 128  |  Size: 9.2 KiB

15
web_switch_company_warning/static/description/index.html → web_switch_context_warning/static/description/index.html

@ -4,7 +4,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="generator" content="Docutils 0.14: http://docutils.sourceforge.net/" />
<title>Multicompany - Switch Company Warning</title>
<title>Switch Context Warning</title>
<style type="text/css">
/*
@ -360,15 +360,15 @@ ul.auto-toc {
</style>
</head>
<body>
<div class="document" id="multicompany-switch-company-warning">
<h1 class="title">Multicompany - Switch Company Warning</h1>
<div class="document" id="switch-context-warning">
<h1 class="title">Switch Context Warning</h1>
<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/web/tree/11.0/web_switch_company_warning"><img alt="OCA/web" src="https://img.shields.io/badge/github-OCA%2Fweb-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/web-11-0/web-11-0-web_switch_company_warning"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/162/11.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
<p>Shows a warning if current company has been switched in another tab or window.</p>
<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/web/tree/11.0/web_switch_context_warning"><img alt="OCA/web" src="https://img.shields.io/badge/github-OCA%2Fweb-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/web-11-0/web-11-0-web_switch_context_warning"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/162/11.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
<p>Shows a warning if current user, company or database have been switched in another tab or window.</p>
<p><strong>Table of contents</strong></p>
<div class="contents local topic" id="contents">
<ul class="simple">
@ -396,7 +396,7 @@ ul.auto-toc {
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/web/issues">GitHub Issues</a>.
In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us smashing it by providing a detailed and welcomed
<a class="reference external" href="https://github.com/OCA/web/issues/new?body=module:%20web_switch_company_warning%0Aversion:%2011.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
<a class="reference external" href="https://github.com/OCA/web/issues/new?body=module:%20web_switch_context_warning%0Aversion:%2011.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
<p>Do not contact contributors directly about support or help with technical issues.</p>
</div>
<div class="section" id="credits">
@ -411,6 +411,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
<h2><a class="toc-backref" href="#id5">Contributors</a></h2>
<ul class="simple">
<li>Hparfr &lt;<a class="reference external" href="https://github.com/hparfr">https://github.com/hparfr</a>&gt;</li>
<li>Adria Gil Sorribes &lt;<a class="reference external" href="mailto:adria.gil&#64;eficent.com">adria.gil&#64;eficent.com</a>&gt;</li>
</ul>
</div>
<div class="section" id="maintainers">
@ -420,7 +421,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and
promote its widespread use.</p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/web/tree/11.0/web_switch_company_warning">OCA/web</a> project on GitHub.</p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/web/tree/11.0/web_switch_context_warning">OCA/web</a> project on GitHub.</p>
<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
</div>
</div>

9
web_switch_company_warning/static/src/js/switch_company_warning.js → web_switch_context_warning/static/src/js/switch_company_warning.js

@ -1,4 +1,4 @@
odoo.define('web_switch_company_warning.widget', function (require) {
odoo.define('web_switch_context_warning.widget', function (require) {
'use strict';
var Widget = require('web.Widget');
@ -12,11 +12,11 @@ odoo.define('web_switch_company_warning.widget', function (require) {
return;
}
var SwitchCompanyWarningWidget = Widget.extend({
template:'web_switch_company_warning.warningWidget',
template:'web_switch_context_warning.warningWidget',
init: function () {
this._super();
var self = this;
var w = new SharedWorker('/web_switch_company_warning/static/src/js/switch_company_warning_worker.js');
var w = new SharedWorker('/web_switch_context_warning/static/src/js/switch_company_warning_worker.js');
w.port.addEventListener('message', function (msg) {
if (msg.data.type !== 'newCtx') {
return;
@ -31,7 +31,8 @@ odoo.define('web_switch_company_warning.widget', function (require) {
w.port.postMessage(this.generateSignature());
},
generateSignature: function () {
return [session.company_id, session.db].join();
console.log(session)
return [session.uid, session.company_id, session.db].join();
},
});

0
web_switch_company_warning/static/src/js/switch_company_warning_worker.js → web_switch_context_warning/static/src/js/switch_company_warning_worker.js

4
web_switch_company_warning/static/src/xml/switch_company_warning.xml → web_switch_context_warning/static/src/xml/switch_company_warning.xml

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<template>
<t t-name="web_switch_company_warning.warningWidget">
<t t-name="web_switch_context_warning.warningWidget">
<div class="container-fluid bg-warning" style="text-align: center; display:none;">
<h3>You switched to a different company or database with another tab or window</h3>
<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>

4
web_switch_company_warning/view/view.xml → web_switch_context_warning/view/view.xml

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<openerp>
<data>
<template id="assets_backend" name="web_switch_company_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_company_warning/static/src/js/switch_company_warning.js"></script>
<script type="text/javascript" src="/web_switch_context_warning/static/src/js/switch_company_warning.js"></script>
</xpath>
</template>
</data>
Loading…
Cancel
Save