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] qweb: issue when rendering twice dynamic t-calls

Browse Source 
The previous implementation generated an id each time the template was
rendered, instead of just once per new dynamic template found.
This commit is contained in:
Géry Debongnie
2020-10-19 22:17:10 +02:00
committed by aab-odoo
parent ed9d820d9e
commit a68d7774c6
3 changed files with 37 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/qweb/__snapshots__/qweb.test.ts.snap
+31 -4
View File
@@ -1401,8 +1401,9 @@ exports[`t-call (template calling dynamic t-call 1`] = `
let c1 = [], p1 = {key:1};
let vn1 = h('div', p1, c1);
let tname2 = (scope['template']);
let tid2 = this.constructor.nextId++;
if (!(tname2 in this.subTemplates)) {
let tid2 = this.subTemplates[tname2];
if (!tid2) {
tid2 = this.constructor.nextId++;
this.subTemplates[tname2] = tid2;
this.constructor.subTemplates[tid2] = this._compile(tname2, {hasParent: true, defineKey: true});
}
@@ -1425,8 +1426,34 @@ exports[`t-call (template calling dynamic t-call 2`] = `
let c1 = [], p1 = {key:1};
let vn1 = h('div', p1, c1);
let tname2 = (scope['template']);
let tid2 = this.constructor.nextId++;
if (!(tname2 in this.subTemplates)) {
let tid2 = this.subTemplates[tname2];
if (!tid2) {
tid2 = this.constructor.nextId++;
this.subTemplates[tname2] = tid2;
this.constructor.subTemplates[tid2] = this._compile(tname2, {hasParent: true, defineKey: true});
}
let _origScope3 = scope;
scope = Object.create(scope);
scope.__access_mode__ = 'ro';
this.constructor.subTemplates[tid2].call(this, scope, Object.assign({}, extra, {parentNode: c1, parent: utils.getComponent(context), key: '__4__'}));
scope = _origScope3;
return vn1;
}"
`;
exports[`t-call (template calling dynamic t-call 3`] = `
"function anonymous(context, extra
) {
// Template name: \\"main\\"
let utils = this.constructor.utils;
let scope = Object.create(context);
let h = this.h;
let c1 = [], p1 = {key:1};
let vn1 = h('div', p1, c1);
let tname2 = (scope['template']);
let tid2 = this.subTemplates[tname2];
if (!tid2) {
tid2 = this.constructor.nextId++;
this.subTemplates[tname2] = tid2;
this.constructor.subTemplates[tid2] = this._compile(tname2, {hasParent: true, defineKey: true});
}
tests/qweb/qweb.test.ts
+3
View File
@@ -1111,6 +1111,9 @@ describe("t-call (template calling", () => {
expect(renderToString(qweb, "main", { template: "foo", val: "foo" })).toBe(expected);
const expected2 = "<div><bar>quux</bar></div>";
expect(renderToString(qweb, "main", { template: "bar", val: "quux" })).toBe(expected2);
// duplicate call because there was a specific bug with some id that was
// incremented each rendering.
expect(renderToString(qweb, "main", { template: "bar", val: "quux" })).toBe(expected2);
});
});