diff options
| author | Yannick Tivisse <yti@odoo.com> | 2019-06-27 11:34:29 +0200 |
|---|---|---|
| committer | Yannick Tivisse <yti@odoo.com> | 2019-06-27 11:34:29 +0200 |
| commit | a5b08d5ea52b28d334afb3bd65ccfb17c25dff01 (patch) | |
| tree | 97983316d97bfa05907c37a742ab1115acc87d56 /addons/web/static/src/xml | |
| parent | b2eceae7c927d1b908f8e90e6a911430a7ccfce7 (diff) | |
| parent | d8f95609eb7dd18109856cfa0ae8fdb1080ce959 (diff) | |
[MERGE] web, hr, test_website: Add multi-company tests
test_website: Add multi-company test
=============================
Purpose
------------
This commit tests some behaviors with multi company
mode after changes brought by f847a46.
Specification
-------------------
The website company should be automatically set in the
context as 'allowed_company_ids'.
That way, we can remove the switch company menu on the
website, which doesn't make a lot of sense.
This test enforce this behavior.
web: Add QUnit tests for the SwitchCompanyMenu
=========================================
Purpose
------------
This commit tests some behaviors with multi company
mode after changes brought by f847a46.
Specification
------------------
Ensure the robustness of the switch company menu for
multiple cases like:
- Bar rendering
- Switch to another company in mono/multi environment
- Toggle another company in mono/multi environment
- Remove a company in mono/multi environment
The widget itself has been slighty modified to make
it more testable:
- Reading from session is now in the `willStart` function
instead of `init` to allow mocking the session (in tests,
`init` is executed before the mock is applied).
- In the event handlers, don't use `bbq` to retrieve
current allowed company ids. `bbq` is not easily nor
cleanly patched.
- When reading allowed company ids from session, cast
ids from string to integer. They are everywhere casted
except there.
and some linting
hr: Add multi company tests
======================
Purpose
-------------
This commit tests some behaviors with multi company
mode after changes brought by f847a46.
Specification
------------------
Check that a report printing for several records on
different companies:
- Works if the context is correctly set, i.e. both
companies are in the allowed_company_ids
- Doesn't work if the context is not correctly set
Diffstat (limited to 'addons/web/static/src/xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index e34d017b1a4..878a9cfaef5 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1469,21 +1469,21 @@ <div role="menuitem" href="#" class="dropdown-item d-flex py-0 px-0" data-menu="company" t-att-data-company-id="company[0]"> <div class="ml-auto pl-3 pr-3 border border-top-0 border-left-0 border-bottom-0 toggle_company o_py"> <span style="height: 2rem;"> - <t t-if="widget.allowed_company_ids.includes(company[0].toString())"> + <t t-if="widget.allowed_company_ids.includes(company[0])"> <i class="fa fa-fw fa-check-square pt-2"></i> </t> - <t t-if="!widget.allowed_company_ids.includes(company[0].toString())"> + <t t-if="!widget.allowed_company_ids.includes(company[0])"> <i class="fa fa-fw fa-square-o pt-2"></i> </t> </span> </div> <div class="d-flex flex-grow-1 align-items-center py-0 log_into pl-3 o_py" t-att-style="company[0] === widget.current_company ? 'background-color: lightgrey;' : ''"> - <t t-if="widget.allowed_company_ids.includes(company[0].toString())"> + <t t-if="widget.allowed_company_ids.includes(company[0])"> <span class='mr-3 company_label'> <t t-esc="company[1]"/> </span> </t> - <t t-if="!widget.allowed_company_ids.includes(company[0].toString())"> + <t t-if="!widget.allowed_company_ids.includes(company[0])"> <span class='mr-3 company_label text-muted'> <t t-esc="company[1]"/> </span> |