diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-11-25 13:26:02 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-11-25 13:26:02 +0100 |
| commit | 56a442e205f7837282f3f74afd0694bfe3a64ca1 (patch) | |
| tree | f964cf6899e0000202d9b7acaabe18023b2d9257 /addons/web/static/lib/py.js | |
| parent | 8d3bdf6b50382020ae3d98d8911c3a136e17d519 (diff) | |
| parent | dade7e3c1790bf54187618b0a1c4befab935dfd5 (diff) | |
[MERGE] forward port of branch saas-6 up to dade7e3
Diffstat (limited to 'addons/web/static/lib/py.js')
| -rw-r--r-- | addons/web/static/lib/py.js/lib/py.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/web/static/lib/py.js/lib/py.js b/addons/web/static/lib/py.js/lib/py.js index 40e3110857a..f4ae13d9e44 100644 --- a/addons/web/static/lib/py.js/lib/py.js +++ b/addons/web/static/lib/py.js/lib/py.js @@ -317,10 +317,10 @@ var py = {}; } else if (token in symbols) { var symbol; // transform 'not in' and 'is not' in a single token - if (token === 'in' && tokens[tokens.length-1].id === 'not') { + if (token === 'in' && tokens.length > 1 && tokens[tokens.length-1].id === 'not') { symbol = symbols['not in']; tokens.pop(); - } else if (token === 'not' && tokens.length > 0 && tokens[tokens.length-1].id === 'is') { + } else if (token === 'not' && tokens.length > 1 && tokens[tokens.length-1].id === 'is') { symbol = symbols['is not']; tokens.pop(); } else { |