mirror of https://github.com/OCA/web.git
[FIX] web_drop_target: Hide it when it is not the current action or has no chatter
parent
3fe6442f52
commit
3f2c9624fe
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
odoo.define("web_drop_target", function (require) {
|
odoo.define("web_drop_target", function (require) {
|
||||||
"use strict";
|
"use strict";
|
||||||
|
const ActionManager = require("web.ActionManager");
|
||||||
const FormController = require("web.FormController");
|
const FormController = require("web.FormController");
|
||||||
const core = require("web.core");
|
const core = require("web.core");
|
||||||
const qweb = core.qweb;
|
const qweb = core.qweb;
|
||||||
|
@ -152,7 +152,15 @@ odoo.define("web_drop_target", function (require) {
|
||||||
*/
|
*/
|
||||||
_onBodyFileDragover: function (ev) {
|
_onBodyFileDragover: function (ev) {
|
||||||
ev.preventDefault();
|
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 drop_zone_offset = this.$drop_zone.offset();
|
||||||
const overlay_css = {
|
const overlay_css = {
|
||||||
top: drop_zone_offset.top,
|
top: drop_zone_offset.top,
|
||||||
|
@ -168,6 +176,10 @@ odoo.define("web_drop_target", function (require) {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
_checkDragOver: function () {
|
||||||
|
return true;
|
||||||
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @private
|
* @private
|
||||||
* @param {MouseEvent} ev
|
* @param {MouseEvent} ev
|
||||||
|
@ -317,6 +329,9 @@ odoo.define("web_drop_target", function (require) {
|
||||||
_get_record_id: function () {
|
_get_record_id: function () {
|
||||||
return this.renderer.state.res_id;
|
return this.renderer.state.res_id;
|
||||||
},
|
},
|
||||||
|
_checkDragOver: function () {
|
||||||
|
return this.renderer._chatterContainerComponent;
|
||||||
|
},
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue