diff options
| author | Christophe Simonis <chs@odoo.com> | 2014-06-27 16:08:09 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2014-06-27 16:08:09 +0200 |
| commit | 8dfd5eab0134d8995514b7965d3244d260cabfa4 (patch) | |
| tree | 2ef0287b192d95edba8767e1b444b83126102857 /addons/web | |
| parent | 368936df7c980e80ec46d034c5d682b078e155e5 (diff) | |
| parent | a4bc65cdbaf8c26992317d34a99472a012a90735 (diff) | |
[MERGE] forward port of branch saas-4 up to a4bc65c
Diffstat (limited to 'addons/web')
| -rw-r--r-- | addons/web/static/src/js/view_list.js | 1 | ||||
| -rw-r--r-- | addons/web/static/src/js/views.js | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js index 714f7a640d8..dfefa3c0d08 100644 --- a/addons/web/static/src/js/view_list.js +++ b/addons/web/static/src/js/view_list.js @@ -1605,6 +1605,7 @@ instance.web.ListView.Groups = instance.web.Class.extend( /** @lends instance.we .filter(function (column) { return column.tag === 'field';}) .pluck('name').value(), function (groups) { + self.view.$pager.hide(); $el[0].appendChild( self.render_groups(groups)); if (post_render) { post_render(); } diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index ec233159d63..64be8a9493c 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -618,7 +618,6 @@ instance.web.ViewManager = instance.web.Widget.extend({ var view_promise; var form = this.views['form']; if (!view || (form && form.controller && !form.controller.can_be_discarded())) { - self.trigger('switch_mode', view_type, no_store, view_options); return $.Deferred().reject(); } if (!no_store) { |