diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-03-18 14:17:54 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-03-18 14:17:54 +0100 |
| commit | 2940ee6b356fd167f5ece62c92f9a9e8a770aa7d (patch) | |
| tree | 118c3893f17d78879781fca89b3c90aaec87b522 /addons/web/static/lib/qweb/qweb2.js | |
| parent | 1f008a439a3f64801eee88b20b0c3c0606741604 (diff) | |
| parent | c6353942ffdcd68b1781c91e88b5862ffdb5f11b (diff) | |
[MERGE] forward port branch saas-15 up to c6353942ffd
Diffstat (limited to 'addons/web/static/lib/qweb/qweb2.js')
| -rw-r--r-- | addons/web/static/lib/qweb/qweb2.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/web/static/lib/qweb/qweb2.js b/addons/web/static/lib/qweb/qweb2.js index 94a0afaa32a..5e504f57222 100644 --- a/addons/web/static/lib/qweb/qweb2.js +++ b/addons/web/static/lib/qweb/qweb2.js @@ -173,7 +173,7 @@ var QWeb2 = { new_dict[as_first] = index === 0; new_dict[as_last] = index + 1 === size; new_dict[as_parity] = (index % 2 == 1 ? 'odd' : 'even'); - if (cur.constructor === Object) { + if (cur && cur.constructor === Object) { this.extend(new_dict, cur); } new_dict[as] = cur; |