[MERGE] forward port branch saas-10 up to e1bd405

2 files changed, 8 insertions, 1 deletions

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 057bdd45aef..2eafb325882 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -98,7 +98,7 @@ def ensure_db(redirect='/web/database/selector'):
     # If the db is taken out of a query parameter, it will be checked against
     # `http.db_filter()` in order to ensure it's legit and thus avoid db
     # forgering that could lead to xss attacks.
-    db = request.params.get('db')
+    db = request.params.get('db') and request.params.get('db').strip()
 
     # Ensure db is legit
     if db and db not in http.db_filter([db]):
diff --git a/addons/web/static/src/js/framework/data.js b/addons/web/static/src/js/framework/data.js
index 008a9e879dc..577a1ec42f0 100644
--- a/addons/web/static/src/js/framework/data.js
+++ b/addons/web/static/src/js/framework/data.js
@@ -710,6 +710,13 @@ var DataSetSearch = DataSet.extend({
             this._length -= (before - this.ids.length);
         }
     },
+    add_ids: function(ids, at) {
+        var before = this.ids.length;
+        this._super(ids, at);
+        if(this._length){
+            this._length += (this.ids.length - before);
+        }
+    },
     unlink: function(ids, callback, error_callback) {
         var self = this;
         return this._super(ids).done(function() {