1 files changed, 8 insertions, 8 deletions

diff --git a/addons/web_settings_dashboard/static/src/js/dashboard.js b/addons/web_settings_dashboard/static/src/js/dashboard.js
index a51b5c173b5..9807a00d001 100644
--- a/addons/web_settings_dashboard/static/src/js/dashboard.js
+++ b/addons/web_settings_dashboard/static/src/js/dashboard.js
@@ -20,13 +20,13 @@ var Dashboard = AbstractAction.extend({
 
     start: function(){
         var superDef = this._super.apply(this, arguments);
-        return $.when(superDef, this.load(this.all_dashboards));
+        return Promise.all([superDef, this.load(this.all_dashboards)]);
     },
 
     load: function(dashboards){
         var self = this;
-        var loading_done = new $.Deferred();
-        this._rpc({route: '/web_settings_dashboard/data'})
+        return new Promise(function (resolve, reject) {
+            self._rpc({route: '/web_settings_dashboard/data'})
             .then(function (data) {
                 // Load each dashboard
                 var all_dashboards_defs = [];
@@ -37,12 +37,12 @@ var Dashboard = AbstractAction.extend({
                     }
                 });
 
-                // Resolve loading_done when all dashboards defs are resolved
-                $.when.apply($, all_dashboards_defs).then(function() {
-                    loading_done.resolve();
+                // Resolve the promise when all dashboards defs are resolved
+                Promise.all(all_dashboards_defs).then(function() {
+                    resolve();
                 });
             });
-        return loading_done;
+        });
     },
 
     load_apps: function(data){
@@ -220,7 +220,7 @@ var DashboardInvitations = Widget.extend({
             .then(function () {
                 self.reload();
             })
-            .fail(function () {
+            .guardedCatch(function () {
                 $button.button('reset');
             });
         }