diff options
| author | Denis Ledoux <dle@odoo.com> | 2015-11-23 17:40:15 +0100 |
|---|---|---|
| committer | Denis Ledoux <dle@odoo.com> | 2015-11-23 17:40:15 +0100 |
| commit | 32fd520d973103ed3225975ca211d5b5852c6609 (patch) | |
| tree | 16c00f7e5105ea9c696092d677cace9446fd0c16 /addons/web/static/lib/py.js | |
| parent | 5c9b4556e35c420985696b0c958ca492030efa4a (diff) | |
| parent | 6f29cbe3ace5302781aa51d727b4358903efb373 (diff) | |
[MERGE] forward port of branch 8.0 up to 6f29cbe
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 35bb0b5223e..a59dabb06e5 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 { |
