diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-03-18 10:20:06 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-03-18 10:20:06 +0100 |
| commit | 5162ca7be7dbc994d60fbcbf080ff09f9fa12bc0 (patch) | |
| tree | a3e4086bbcee294fa5c3ddaf813c555892f7069f /addons/web/static/lib/qweb/qweb2.js | |
| parent | d5a8b238fac3c7920c034e4be5fc86347d5eea50 (diff) | |
| parent | 36ba37a7a1c959550f5688cc69c4e7a3abd9d02a (diff) | |
[MERGE] forward port branch 10.0 up to 36ba37a7a1c
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 378c5eb6023..f59318ff910 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; |