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

Merge PR #1676 into 13.0 

Signed-off-by JordiBForgeFlow
pull/1681/head
OCA-git-bot 2020-09-08 13:32:48 +00:00
parent 5ba3df6a7f a3dee35594
commit 92e7f939ad
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
web_drop_target/readme/CONTRIBUTORS.rst
View File

@ -2,3 +2,4 @@
* Pablo Fuentes <pablo@studio73.es>
* Akim Juillerat <akim.juillerat@camptocamp.com>
* Enric Tobella <etobella@creublanca.es>
* Lois Rilo <lois.rilo@forgeflow.com>

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

@ -52,7 +52,7 @@ odoo.define("web_drop_target", function(require) {
},
_get_drop_items: function(e) {
if (this.renderer.state.res_id) {
if (this._get_record_id()) {
var self = this,
dataTransfer = e.originalEvent.dataTransfer,
drop_items = [];
@ -133,6 +133,12 @@ odoo.define("web_drop_target", function(require) {
reader.readAsArrayBuffer(file);
},
_get_record_id: function() {
// Implement when including this mixin. Return the record ID.
console.log("'_get_record_id': Not Implemented");
return false;
},
_add_overlay: function() {
var self = this;
if (!this._drop_overlay) {
@ -140,7 +146,7 @@ odoo.define("web_drop_target", function(require) {
view_manager = jQuery(".o_view_manager_content");
this._drop_overlay = jQuery(
qweb.render("web_drop_target.drop_overlay", {
id: self.renderer.state.res_id,
id: self._get_record_id(),
})
);
var o_content_position = o_content.position();
@ -150,7 +156,7 @@ odoo.define("web_drop_target", function(require) {
width: view_manager.width(),
height: view_manager.height(),
});
if (!this.renderer.state.res_id) {
if (!this._get_record_id()) {
this._drop_overlay.css("background", "#FF000020");
}
o_content.append(this._drop_overlay);
@ -181,6 +187,9 @@ odoo.define("web_drop_target", function(require) {
);
});
},
_get_record_id: function() {
return this.renderer.state.res_id;
},
})
);