NextERP/owl
2
0
Fork 0
mirror of https://github.com/odoo/owl.git synced 2025-10-06 19:59:41 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix issue with navbar in home menu with no active app

Browse Source
This commit is contained in:
Géry Debongnie
2019-02-20 15:03:32 +01:00
parent 203ce91e92
commit 16dc33cc05
4 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/static/src/xml/templates.xml
+1 -1
View File
@@ -14,7 +14,7 @@
</div> </div>
<div t-name="web.navbar" class="o_navbar" t-att-class="props.inHome ? 'o_navbar o_in_home' : 'o_navbar'"> <div t-name="web.navbar" class="o_navbar" t-att-class="props.inHome ? 'o_navbar o_in_home' : 'o_navbar'">
<a aria-label="Applications" t-att-class="props.inHome ? 'o_title fa fa-chevron-left' : 'o_title fa fa-th'" href="#" title="Applications" accesskey="h" t-on-click="toggleHome"/> <a aria-label="Applications" t-if="!props.inHome || props.app" t-att-class="props.inHome ? 'o_title fa fa-chevron-left' : 'o_title fa fa-th'" href="#" title="Applications" accesskey="h" t-on-click="toggleHome"/>
<t t-if="!props.inHome &amp;&amp; props.app"> <t t-if="!props.inHome &amp;&amp; props.app">
<a class="o_menu_brand" t-att-href="getUrl(props.app)" role="button" t-on-click="openMenu(props.app)"> <a class="o_menu_brand" t-att-href="getUrl(props.app)" role="button" t-on-click="openMenu(props.app)">
<t t-esc="props.app.name"/> <t t-esc="props.app.name"/>
web/static/tests/widgets/__snapshots__/navbar.test.ts.snap
+10 -3
View File
@@ -1,8 +1,15 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP // Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`can be rendered 1`] = ` exports[`can be rendered (in home menu, no app) 1`] = `
"<div class=\\"o_navbar\\"> "<div class=\\"o_navbar o_in_home\\">
<a aria-label=\\"Applications\\" class=\\"o_title fa fa-th\\" href=\\"#\\" title=\\"Applications\\" accesskey=\\"h\\"></a>
</div>"
`;
exports[`can be rendered (in home menu, one active app) 1`] = `
"<div class=\\"o_navbar o_in_home\\">
<a aria-label=\\"Applications\\" class=\\"o_title fa fa-chevron-left\\" href=\\"#\\" title=\\"Applications\\" accesskey=\\"h\\"></a>
</div>" </div>"
`; `;
web/static/tests/widgets/__snapshots__/root.test.ts.snap
+1 -1
View File
@@ -3,7 +3,7 @@
exports[`can be rendered (in home menu) 1`] = ` exports[`can be rendered (in home menu) 1`] = `
"<div class=\\"o_web_client\\"> "<div class=\\"o_web_client\\">
<div class=\\"o_navbar o_in_home\\"> <div class=\\"o_navbar o_in_home\\">
<a aria-label=\\"Applications\\" class=\\"o_title fa fa-chevron-left\\" href=\\"#\\" title=\\"Applications\\" accesskey=\\"h\\"></a>
</div> </div>
web/static/tests/widgets/navbar.test.ts
+9 -1
View File
@@ -34,7 +34,15 @@ afterEach(() => {
// Tests // Tests
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
test("can be rendered", async () => { test("can be rendered (in home menu, no app)", async () => {
props.inHome = true;
const navbar = new Navbar(env, props);
await navbar.mount(fixture);
expect(fixture.innerHTML).toMatchSnapshot();
});
test("can be rendered (in home menu, one active app)", async () => {
props = { inHome: true, app: menuInfo.menus[96]! };
const navbar = new Navbar(env, props); const navbar = new Navbar(env, props);
await navbar.mount(fixture); await navbar.mount(fixture);
expect(fixture.innerHTML).toMatchSnapshot(); expect(fixture.innerHTML).toMatchSnapshot();