diff options
| author | Yannick Tivisse <yti@odoo.com> | 2019-05-21 15:53:08 +0200 |
|---|---|---|
| committer | Yannick Tivisse <yti@odoo.com> | 2019-06-04 14:01:42 +0200 |
| commit | 2996e7645fc41598bb2db856c9bcc47116c3f693 (patch) | |
| tree | 920da2a4ae83902df92b05f9367b8fc2ffc3131a /addons/web | |
| parent | 3d06a773931aea34cdef6c31857447df10bc6304 (diff) | |
[IMP] base: Remove group toggle_multi_company
Fp request
Diffstat (limited to 'addons/web')
| -rw-r--r-- | addons/web/models/ir_http.py | 1 | ||||
| -rw-r--r-- | addons/web/static/src/js/widgets/switch_company_menu.js | 1 | ||||
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 22 |
3 files changed, 10 insertions, 14 deletions
diff --git a/addons/web/models/ir_http.py b/addons/web/models/ir_http.py index 7ae119c02d3..d4280e7f25a 100644 --- a/addons/web/models/ir_http.py +++ b/addons/web/models/ir_http.py @@ -56,7 +56,6 @@ class Http(models.AbstractModel): "web.base.url": self.env['ir.config_parameter'].sudo().get_param('web.base.url', default=''), "show_effect": True, "display_switch_company_menu": user.has_group('base.group_multi_company') and len(user.company_ids) > 1, - "toggle_company": user.has_group('base.group_toggle_company'), "cache_hashes": { "load_menus": hashlib.sha1(menu_json_utf8).hexdigest(), "qweb": qweb_checksum, diff --git a/addons/web/static/src/js/widgets/switch_company_menu.js b/addons/web/static/src/js/widgets/switch_company_menu.js index 4b52b879447..153c6b164cb 100644 --- a/addons/web/static/src/js/widgets/switch_company_menu.js +++ b/addons/web/static/src/js/widgets/switch_company_menu.js @@ -31,7 +31,6 @@ var SwitchCompanyMenu = Widget.extend({ this._onSwitchCompanyClick = _.debounce(this._onSwitchCompanyClick, 1500, true); this.allowed_company_ids = String(session.user_context.allowed_company_ids).split(','); this.user_companies = session.user_companies.allowed_companies; - this.toggle_company = session.toggle_company; var hash = $.bbq.getState() if (!hash.cids || hash.cids === undefined) { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 77e8ab075b1..9c29b21968c 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1582,18 +1582,16 @@ </span> </t> </div> - <t t-if="widget.toggle_company"> - <div class="ml-auto pl-3 pr-3 border border-top-0 border-right-0 border-bottom-0 toggle_company o_py"> - <span style="height: 2rem;"> - <t t-if="widget.allowed_company_ids.includes(company[0].toString())"> - <i class="fa fa-fw fa-check-square pt-2"></i> - </t> - <t t-if="!widget.allowed_company_ids.includes(company[0].toString())"> - <i class="fa fa-fw fa-square-o pt-2"></i> - </t> - </span> - </div> - </t> + <div class="ml-auto pl-3 pr-3 border border-top-0 border-right-0 border-bottom-0 toggle_company o_py"> + <span style="height: 2rem;"> + <t t-if="widget.allowed_company_ids.includes(company[0].toString())"> + <i class="fa fa-fw fa-check-square pt-2"></i> + </t> + <t t-if="!widget.allowed_company_ids.includes(company[0].toString())"> + <i class="fa fa-fw fa-square-o pt-2"></i> + </t> + </span> + </div> </div> </t> </div> |