Techsystech
/
web_techsystech
forked from Techsystech/web
3
0
Fork 0
Code Pull Requests Activity

[FIX] prevent drop when no record id is found

13.0
Adrià Gil Sorribes 2020-03-18 15:32:30 +01:00
parent f35b49ac57
commit bb1fd8703a
6 changed files with 127 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
setup/web_drop_target/odoo/addons/web_drop_target 120000
View File

@ -0,0 +1 @@
../../../../web_drop_target

6
setup/web_drop_target/setup.py 100644
View File

@ -0,0 +1,6 @@
import setuptools
setuptools.setup(
setup_requires=['setuptools-odoo'],
odoo_addon=True,
)

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

@ -1,10 +1,12 @@
//Copyright 2018 Therp BV <https://therp.nl> // Copyright 2018 Therp BV <https://therp.nl>
//License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). // License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
/*global Uint8Array base64js*/ /* global Uint8Array base64js*/
odoo.define('web_drop_target', function(require) { odoo.define("web_drop_target", function(require) {
var FormController = require('web.FormController'); "use strict";
var core = require('web.core');
var FormController = require("web.FormController");
var core = require("web.core");
var qweb = core.qweb; var qweb = core.qweb;
// This is the main contribution of this addon: A mixin you can use // This is the main contribution of this addon: A mixin you can use
@ -18,15 +20,15 @@ odoo.define('web_drop_target', function(require) {
start: function() { start: function() {
var result = this._super.apply(this, arguments); var result = this._super.apply(this, arguments);
this.$el.on('drop.widget_events', this.proxy('_on_drop')); this.$el.on("drop.widget_events", this.proxy("_on_drop"));
this.$el.on('dragenter.widget_events', this.proxy('_on_dragenter')); this.$el.on("dragenter.widget_events", this.proxy("_on_dragenter"));
this.$el.on('dragover.widget_events', this.proxy('_on_dragenter')); this.$el.on("dragover.widget_events", this.proxy("_on_dragenter"));
this.$el.on('dragleave.widget_events', this.proxy('_on_dragleave')); this.$el.on("dragleave.widget_events", this.proxy("_on_dragleave"));
return result; return result;
}, },
_on_drop: function(e) { _on_drop: function(e) {
if (!this._drop_overlay){ if (!this._drop_overlay) {
return; return;
} }
var drop_items = this._get_drop_items(e); var drop_items = this._get_drop_items(e);
@ -35,7 +37,7 @@ odoo.define('web_drop_target', function(require) {
if (!drop_items) { if (!drop_items) {
return; return;
} }
this._handle_drop_items(drop_items, e) this._handle_drop_items(drop_items, e);
}, },
_on_dragenter: function(e) { _on_dragenter: function(e) {
@ -50,6 +52,7 @@ odoo.define('web_drop_target', function(require) {
}, },
_get_drop_items: function(e) { _get_drop_items: function(e) {
if (this.renderer.state.res_id) {
var self = this, var self = this,
dataTransfer = e.originalEvent.dataTransfer, dataTransfer = e.originalEvent.dataTransfer,
drop_items = []; drop_items = [];
@ -62,9 +65,11 @@ odoo.define('web_drop_target', function(require) {
} }
}); });
return drop_items; return drop_items;
}
return null;
}, },
// Eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
_handle_drop_items: function(drop_items, e) { _handle_drop_items: function(drop_items, e) {
// Do something here, for example call the helper function below // Do something here, for example call the helper function below
// e is the on_load_end handler for the FileReader above, // e is the on_load_end handler for the FileReader above,
@ -75,38 +80,38 @@ odoo.define('web_drop_target', function(require) {
// Helper to upload an attachment and update the sidebar // Helper to upload an attachment and update the sidebar
var self = this; var self = this;
return this._rpc({ return this._rpc({
model: 'ir.attachment', model: "ir.attachment",
method: 'create', method: "create",
args: [ args: [
_.extend({ _.extend(
{
name: file.name, name: file.name,
datas: base64js.fromByteArray( datas: base64js.fromByteArray(
new Uint8Array(reader.result) new Uint8Array(reader.result)
), ),
res_model: res_model, res_model: res_model,
res_id: res_id, res_id: res_id,
}, extra_data || {}) },
extra_data || {}
),
], ],
}) }).then(function() {
.then(function() {
// Find the chatter among the children, there should be only // Find the chatter among the children, there should be only
// one // one
var res = _.filter(self.getChildren(), 'chatter') var res = _.filter(self.getChildren(), "chatter");
if (res.length) { if (res.length) {
res[0].chatter._reloadAttachmentBox(); res[0].chatter._reloadAttachmentBox();
res[0].chatter.trigger_up('reload'); res[0].chatter.trigger_up("reload");
res[0].chatter.$('.o_chatter_button_attachment').click(); res[0].chatter.$(".o_chatter_button_attachment").click();
} }
}); });
}, },
_file_reader_error_handler: function(e){ _file_reader_error_handler: function(e) {
console.error(e); console.error(e);
}, },
_handle_file_drop_attach: function( _handle_file_drop_attach: function(item, e, res_model, res_id, extra_data) {
item, e, res_model, res_id, extra_data
) {
var self = this; var self = this;
var file = item; var file = item;
if (!file || !(file instanceof Blob)) { if (!file || !(file instanceof Blob)) {
@ -114,26 +119,40 @@ odoo.define('web_drop_target', function(require) {
} }
var reader = new FileReader(); var reader = new FileReader();
reader.onloadend = self.proxy( reader.onloadend = self.proxy(
_.partial(self._create_attachment, file, reader, e, res_model, res_id, extra_data) _.partial(
self._create_attachment,
file,
reader,
e,
res_model,
res_id,
extra_data
)
); );
reader.onerror = self.proxy('_file_reader_error_handler'); reader.onerror = self.proxy("_file_reader_error_handler");
reader.readAsArrayBuffer(file); reader.readAsArrayBuffer(file);
}, },
_add_overlay: function() { _add_overlay: function() {
if (!this._drop_overlay){ var self = this;
var o_content = jQuery('.o_content'), if (!this._drop_overlay) {
view_manager = jQuery('.o_view_manager_content'); var o_content = jQuery(".o_content"),
view_manager = jQuery(".o_view_manager_content");
this._drop_overlay = jQuery( this._drop_overlay = jQuery(
qweb.render('web_drop_target.drop_overlay') qweb.render("web_drop_target.drop_overlay", {
id: self.renderer.state.res_id,
})
); );
var o_content_position = o_content.position(); var o_content_position = o_content.position();
this._drop_overlay.css({ this._drop_overlay.css({
'top': o_content_position.top, top: o_content_position.top,
'left': o_content_position.left, left: o_content_position.left,
'width': view_manager.width(), width: view_manager.width(),
'height': view_manager.height() height: view_manager.height(),
}); });
if (!this.renderer.state.res_id) {
this._drop_overlay.css("background", "#FF000020");
}
o_content.append(this._drop_overlay); o_content.append(this._drop_overlay);
} }
}, },
@ -143,32 +162,29 @@ odoo.define('web_drop_target', function(require) {
this._drop_overlay.remove(); this._drop_overlay.remove();
this._drop_overlay = null; this._drop_overlay = null;
} }
} },
}; };
// And here we apply the mixin to form views, allowing any files and // And here we apply the mixin to form views, allowing any files and
// adding them as attachment // adding them as attachment
FormController.include(_.extend(DropTargetMixin, { FormController.include(
_get_drop_file: function() { _.extend(DropTargetMixin, {
// Disable drag&drop when we're on an unsaved record // eslint-disable-next-line no-unused-vars
if (!this.datarecord.id) {
return null;
}
return this._super.apply(this, arguments);
},
_handle_drop_items: function(drop_items, e) { _handle_drop_items: function(drop_items, e) {
var self = this; var self = this;
_.each(drop_items, function(item, e) { _.each(drop_items, function(item, e) {
return self._handle_file_drop_attach( return self._handle_file_drop_attach(
item, e, self.renderer.state.model, item,
e,
self.renderer.state.model,
self.renderer.state.res_id self.renderer.state.res_id
); );
}); });
} },
})); })
);
return { return {
'DropTargetMixin': DropTargetMixin, DropTargetMixin: DropTargetMixin,
}; };
}); });

6
web_drop_target/static/src/less/web_drop_target.less
View File

@ -1,14 +1,14 @@
.o_content { .o_content {
.o_drag_over{ .o_drag_over {
position: fixed; position: fixed;
top: 0; top: 0;
left: 0; left: 0;
width: 100%; width: 100%;
height: 100%; height: 100%;
background-color: rgba(255,255,255,0.6); background-color: rgba(255, 255, 255, 0.6);
border: 1px dashed #4c4c4c; border: 1px dashed #4c4c4c;
pointer-events: none; pointer-events: none;
.o_drag_over_content{ .o_drag_over_content {
position: relative; position: relative;
top: 50%; top: 50%;
transform: translate(0%, -50%); transform: translate(0%, -50%);

10
web_drop_target/static/src/xml/widgets.xml
View File

@ -1,14 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8" ?>
<template> <template>
<t t-name="web_drop_target.drop_overlay"> <t t-name="web_drop_target.drop_overlay">
<div class="o_drag_over"> <div class="o_drag_over">
<div class="o_drag_over_content"> <div class="o_drag_over_content">
<div> <div>
<i class="fa fa-file-o fa-5x" aria-hidden="true"></i> <i class="fa fa-file-o fa-5x" aria-hidden="true" />
</div> </div>
<div> <div>
<t t-if="id">
<h2>Drop your files here</h2> <h2>Drop your files here</h2>
</t>
<t t-else="">
<h2>Please save the record before dropping a file</h2>
</t>
</div> </div>
</div> </div>
</div> </div>

23
web_drop_target/views/templates.xml
View File

@ -1,10 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8" ?>
<odoo> <odoo>
<template id="assets_backend" name="web_drop_target assets" inherit_id="web.assets_backend"> <template
id="assets_backend"
name="web_drop_target assets"
inherit_id="web.assets_backend"
>
<xpath expr="." position="inside"> <xpath expr="." position="inside">
<script type="text/javascript" src="/web_drop_target/static/lib/base64js.min.js"></script> <script
<script type="text/javascript" src="/web_drop_target/static/src/js/web_drop_target.js"></script> type="text/javascript"
<link rel="stylesheet" href="/web_drop_target/static/src/less/web_drop_target.less"/> src="/web_drop_target/static/lib/base64js.min.js"
/>
<script
type="text/javascript"
src="/web_drop_target/static/src/js/web_drop_target.js"
/>
<link
rel="stylesheet"
href="/web_drop_target/static/src/less/web_drop_target.less"
/>
</xpath> </xpath>
</template> </template>
</odoo> </odoo>