[IMP] web: use builtin crash manager hooks for special handling

* having a special case for session expiration seems unnecessary when
  the CM specifically supports hooking on the exception name
* and properly implement the special handling of HTTP 504 (Gateway
  Timeout) from #24854 using that same hook

1 files changed, 20 insertions, 4 deletions

diff --git a/addons/web/static/src/js/services/crash_manager.js b/addons/web/static/src/js/services/crash_manager.js
index f3bfa87341c..a5b8cb32c13 100644
--- a/addons/web/static/src/js/services/crash_manager.js
+++ b/addons/web/static/src/js/services/crash_manager.js
@@ -55,10 +55,6 @@ var CrashManager = core.Class.extend({
             new (handler)(this, error).display();
             return;
         }
-        if (error.data.name === "odoo.http.SessionExpiredException" || error.data.name === "werkzeug.exceptions.Forbidden") {
-            this.show_warning({type: _t("Odoo Session Expired"), data: {message: _t("Your Odoo session expired. Please refresh the current web page.")}});
-            return;
-        }
         if (_.has(map_title, error.data.exception_type)) {
             if(error.data.exception_type === 'except_orm'){
                 if(error.data.arguments[1]) {
@@ -210,6 +206,26 @@ var RedirectWarningHandler = Dialog.extend(ExceptionHandler, {
 
 core.crash_registry.add('odoo.exceptions.RedirectWarning', RedirectWarningHandler);
 
+function session_expired(cm) {
+    return {
+        display: function () {
+            cm.show_warning({type: _t("Odoo Session Expired"), data: {message: _t("Your Odoo session expired. Please refresh the current web page.")}});
+        }
+    }
+}
+core.crash_registry.add('odoo.http.SessionExpiredException', session_expired);
+core.crash_registry.add('werkzeug.exceptions.Forbidden', session_expired);
+
+core.crash_registry.add('504', function (cm) {
+    return {
+        display: function () {
+            cm.show_warning({
+                type: _t("Request timeout"),
+                data: {message: _t("The operation was interrupted. This usually means that the current operation is taking too much time.")}});
+        }
+    }
+});
+
 return CrashManager;
 });