Merge PR OCA#2369 into 14.0

Signed-off-by etobella
moduon · Nov 10, 2023 · af22512 · af22512
2 parents c9c5fa7 + 356bedb
commit af22512
Showing 1 changed file with 6 additions and 14 deletions.
diff --git a/web_drop_target/static/src/js/web_drop_target.js b/web_drop_target/static/src/js/web_drop_target.js
@@ -5,7 +5,6 @@
 
 odoo.define("web_drop_target", function (require) {
     "use strict";
-    const ActionManager = require("web.ActionManager");
     const FormController = require("web.FormController");
     const core = require("web.core");
     const qweb = core.qweb;
@@ -153,16 +152,7 @@ odoo.define("web_drop_target", function (require) {
          */
         _onBodyFileDragover: function (ev) {
             ev.preventDefault();
-            const actionManager = this.findAncestor(function (ancestor) {
-                return ancestor instanceof ActionManager;
-            });
-            const controller = actionManager.currentDialogController;
-            if (
-                _.isEmpty(this._get_drop_items(ev)) &&
-                this._checkDragOver() &&
-                (controller === undefined ||
-                    (controller && controller.jsID === this.controllerID))
-            ) {
+            if (_.isEmpty(this._get_drop_items(ev)) && this._checkDragOver()) {
                 const drop_zone_offset = this.$drop_zone.offset();
                 const overlay_css = {
                     top: drop_zone_offset.top,
@@ -173,8 +163,10 @@ odoo.define("web_drop_target", function (require) {
                 if (!this._get_record_id()) {
                     overlay_css.background = "#FF000020";
                 }
-                this._drop_overlay.css(overlay_css);
-                this._drop_overlay.removeClass("d-none");
+                if (this._drop_overlay) {
+                    this._drop_overlay.css(overlay_css);
+                    this._drop_overlay.removeClass("d-none");
+                }
             }
         },
 
@@ -188,7 +180,7 @@ odoo.define("web_drop_target", function (require) {
          */
         _onBodyFileDrop: function (ev) {
             ev.preventDefault();
-            this._drop_overlay.addClass("d-none");
+            if (this._drop_overlay) this._drop_overlay.addClass("d-none");
         },
 
         /**