diff options
| author | Olivier Dony <odo@openerp.com> | 2015-06-23 15:36:16 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2015-06-23 15:36:16 +0200 |
| commit | a180cbddf74bfdcf1e4a550caca2c7b006bf3cb5 (patch) | |
| tree | 1e165181a80bc2a630972f6008b97fdc066377fb /addons/web/static/src | |
| parent | d834f37b91daf13beeb67e09e6be8eb0ffff1ef5 (diff) | |
| parent | 9b1aa53f29ce75a3379a5295aca734874cc502c1 (diff) | |
[MERGE] Forward-port 8.0 up to 9b1aa53f29ce75a3379a5295aca734874cc502c1
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/views.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index e92345f6543..1fb3f15506b 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -1321,7 +1321,7 @@ instance.web.View = instance.web.Widget.extend({ // Wrong group_by values will simply fail and forbid rendering of the destination view var ncontext = new instance.web.CompoundContext( _.object(_.reject(_.pairs(dataset.get_context().eval()), function(pair) { - return pair[0].match('^(?:(?:default_|search_default_).+|.+_view_ref|group_by|group_by_no_leaf|active_id|active_ids)$') !== null; + return pair[0].match('^(?:(?:default_|search_default_|show_).+|.+_view_ref|group_by|group_by_no_leaf|active_id|active_ids)$') !== null; })) ); ncontext.add(action_data.context || {}); |
