Techsystech
/
web
mirror of https://github.com/OCA/web.git
3
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

[FIX] web_drop_target: Hide it when it is not the current action or has no chatter

pull/2066/head
Enric Tobella 2021-11-22 14:42:44 +01:00
parent 3fe6442f52
commit 3f2c9624fe
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
web_drop_target/static/src/js/web_drop_target.js
View File

@ -5,7 +5,7 @@
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;
@ -152,7 +152,15 @@ odoo.define("web_drop_target", function (require) {
*/
_onBodyFileDragover: function (ev) {
ev.preventDefault();
if (_.isEmpty(this._get_drop_items(ev))) {
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.jsID === this.controllerID)
) {
const drop_zone_offset = this.$drop_zone.offset();
const overlay_css = {
top: drop_zone_offset.top,
@ -168,6 +176,10 @@ odoo.define("web_drop_target", function (require) {
}
},
_checkDragOver: function () {
return true;
},
/**
* @private
* @param {MouseEvent} ev
@ -317,6 +329,9 @@ odoo.define("web_drop_target", function (require) {
_get_record_id: function () {
return this.renderer.state.res_id;
},
_checkDragOver: function () {
return this.renderer._chatterContainerComponent;
},
})
);