[MERGE] forward port of branch saas-4 up to a4bc65c
This commit is contained in:
@@ -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(); }
|
||||
|
||||
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user