[MERGE] forward port branch 11.0 up to d279a3e6d57

2 files changed, 13 insertions, 9 deletions

diff --git a/addons/web/static/src/js/views/basic/basic_model.js b/addons/web/static/src/js/views/basic/basic_model.js
index 4028bff322a..4bd12bf2bc3 100644
--- a/addons/web/static/src/js/views/basic/basic_model.js
+++ b/addons/web/static/src/js/views/basic/basic_model.js
@@ -3458,6 +3458,7 @@ var BasicModel = AbstractModel.extend({
                 domain: list.domain,
                 context: list.context,
                 groupBy: list.groupedBy,
+                orderBy: list.orderedBy,
                 lazy: true,
             })
             .then(function (groups) {
diff --git a/addons/web/static/src/js/views/basic/basic_renderer.js b/addons/web/static/src/js/views/basic/basic_renderer.js
index d335999582e..543ce01191e 100644
--- a/addons/web/static/src/js/views/basic/basic_renderer.js
+++ b/addons/web/static/src/js/views/basic/basic_renderer.js
@@ -513,15 +513,18 @@ var BasicRenderer = AbstractRenderer.extend({
         // Update the modifiers registration by associating the widget and by
         // giving the modifiers options now (as the potential callback is
         // associated to new widget)
-        this._registerModifiers(node, record, widget, _.extend({
-            callback: (function (element, modifiers, record) {
-                element.$el.toggleClass('o_field_empty', !!(
-                    record.data.id
-                    && (modifiers.readonly || this.mode === 'readonly')
-                    && !element.widget.isSet()
-                ));
-            }).bind(this),
-        }, modifiersOptions || {}));
+        var self = this;
+        def.then(function () {
+            self._registerModifiers(node, record, widget, _.extend({
+                callback: function (element, modifiers, record) {
+                    element.$el.toggleClass('o_field_empty', !!(
+                        record.data.id
+                        && (modifiers.readonly || self.mode === 'readonly')
+                        && !element.widget.isSet()
+                    ));
+                },
+            }, modifiersOptions || {}));
+        });
 
         return widget;
     },