diff --git a/web_drop_target/README.rst b/web_drop_target/README.rst index af6e18674..250c624e0 100644 --- a/web_drop_target/README.rst +++ b/web_drop_target/README.rst @@ -44,6 +44,9 @@ To use this module, you need to: #. drag a file from your local computer onto an Odoo form view #. it should become an attachment of the currently opened record +.. image:: https://raw.githubusercontent.com/web_drop_target/static/description/screenshot.png + :alt: Screenshot + Development =========== @@ -82,7 +85,9 @@ Contributors ~~~~~~~~~~~~ * Holger Brunn +* Pablo Fuentes * Akim Juillerat +* Enric Tobella Maintainers ~~~~~~~~~~~ diff --git a/web_drop_target/__manifest__.py b/web_drop_target/__manifest__.py index 3c357d1c7..8f550cc59 100644 --- a/web_drop_target/__manifest__.py +++ b/web_drop_target/__manifest__.py @@ -2,7 +2,7 @@ # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). { "name": "Drop target support", - "version": "11.0.1.0.0", + "version": "11.0.2.0.0", "author": "Therp BV,Odoo Community Association (OCA)", "website": "https://github.com/OCA/web", "license": "AGPL-3", @@ -10,8 +10,12 @@ "summary": "Allows to drag files into Odoo", "depends": [ 'web', + 'document' ], "data": [ 'views/templates.xml', ], + "qweb": [ + 'static/src/xml/widgets.xml', + ] } diff --git a/web_drop_target/i18n/fr.po b/web_drop_target/i18n/fr.po new file mode 100644 index 000000000..df168ae65 --- /dev/null +++ b/web_drop_target/i18n/fr.po @@ -0,0 +1,24 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * web_drop_target +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 11.0+e\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-07-10 14:31+0000\n" +"PO-Revision-Date: 2018-07-10 14:31+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: web_drop_target +#. openerp-web +#: code:addons/web_drop_target/static/src/xml/widgets.xml:10 +#, python-format +msgid "Drop your files here" +msgstr "Déposez les fichiers ici" + diff --git a/web_drop_target/i18n/web_drop_target.pot b/web_drop_target/i18n/web_drop_target.pot index 447d3bb3c..b20ba1307 100644 --- a/web_drop_target/i18n/web_drop_target.pot +++ b/web_drop_target/i18n/web_drop_target.pot @@ -1,5 +1,6 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: +# * web_drop_target # msgid "" msgstr "" @@ -12,3 +13,10 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" +#. module: web_drop_target +#. openerp-web +#: code:addons/web_drop_target/static/src/xml/widgets.xml:11 +#, python-format +msgid "Drop your files here" +msgstr "" + diff --git a/web_drop_target/readme/CONTRIBUTORS.rst b/web_drop_target/readme/CONTRIBUTORS.rst index 5e315a748..4230b091a 100644 --- a/web_drop_target/readme/CONTRIBUTORS.rst +++ b/web_drop_target/readme/CONTRIBUTORS.rst @@ -1,2 +1,4 @@ * Holger Brunn -* Akim Juillerat \ No newline at end of file +* Pablo Fuentes +* Akim Juillerat +* Enric Tobella diff --git a/web_drop_target/readme/DEVELOP.rst b/web_drop_target/readme/DEVELOP.rst index 9276685bc..b91df8e2d 100644 --- a/web_drop_target/readme/DEVELOP.rst +++ b/web_drop_target/readme/DEVELOP.rst @@ -1,3 +1,3 @@ **Libraries** -* `base64js `_. \ No newline at end of file +* `base64js `_. diff --git a/web_drop_target/readme/ROADMAP.rst b/web_drop_target/readme/ROADMAP.rst index cffa99158..486912d63 100644 --- a/web_drop_target/readme/ROADMAP.rst +++ b/web_drop_target/readme/ROADMAP.rst @@ -2,4 +2,4 @@ * handle multiple files * add an upload progress meter for huge files * trigger custom events about different stages of the drop operation for other addons to hook in -* Install document module to display attachments in the sidebar \ No newline at end of file +* Install document module to display attachments in the sidebar diff --git a/web_drop_target/readme/USAGE.rst b/web_drop_target/readme/USAGE.rst index a24356e64..9db80f992 100644 --- a/web_drop_target/readme/USAGE.rst +++ b/web_drop_target/readme/USAGE.rst @@ -1,4 +1,7 @@ To use this module, you need to: #. drag a file from your local computer onto an Odoo form view -#. it should become an attachment of the currently opened record \ No newline at end of file +#. it should become an attachment of the currently opened record + +.. image:: /web_drop_target/static/description/screenshot.png + :alt: Screenshot diff --git a/web_drop_target/static/description/index.html b/web_drop_target/static/description/index.html index fca6bf24a..eb011c1d3 100644 --- a/web_drop_target/static/description/index.html +++ b/web_drop_target/static/description/index.html @@ -393,6 +393,7 @@ ul.auto-toc {
  • drag a file from your local computer onto an Odoo form view
  • it should become an attachment of the currently opened record
    • +Screenshot

    Development

    @@ -431,7 +432,9 @@ If you spotted it first, help us smashing it by providing a detailed and welcome

    Contributors

    diff --git a/web_drop_target/static/description/screenshot.png b/web_drop_target/static/description/screenshot.png new file mode 100644 index 000000000..88dc4dced Binary files /dev/null and b/web_drop_target/static/description/screenshot.png differ diff --git a/web_drop_target/static/src/css/web_drop_target.css b/web_drop_target/static/src/css/web_drop_target.css deleted file mode 100644 index e69de29bb..000000000 diff --git a/web_drop_target/static/src/js/web_drop_target.js b/web_drop_target/static/src/js/web_drop_target.js index 165e71cba..4f9c5ed57 100644 --- a/web_drop_target/static/src/js/web_drop_target.js +++ b/web_drop_target/static/src/js/web_drop_target.js @@ -3,17 +3,18 @@ /*global Uint8Array base64js*/ odoo.define('web_drop_target', function(require) { - var FormController = require('web.FormController'); + var FormController = require('web.FormController'); + var core = require('web.core'); + var qweb = core.qweb; // this is the main contribution of this addon: A mixin you can use // to make some widget a drop target. Read on how to use this yourself var DropTargetMixin = { // add the mime types you want to support here, leave empty for - // all types. For more control, override _get_drop_item in your class + // all types. For more control, override _get_drop_items in your class _drop_allowed_types: [], - // a class being applied when the user drags something we can handle - _drag_over_class: 'o_drag_over', + _drop_overlay: null, start: function() { var result = this._super.apply(this, arguments); @@ -25,70 +26,68 @@ odoo.define('web_drop_target', function(require) { }, _on_drop: function(e) { - var drop_item = this._get_drop_item(e); - if(!drop_item) { + if (!this._drop_overlay){ return; } - jQuery(e.delegateTarget).removeClass(this._drag_over_class); - var reader = new FileReader(); - reader.onloadend = this.proxy( - _.partial(this._handle_file_drop, drop_item.getAsFile()) - ); - reader.readAsArrayBuffer(drop_item.getAsFile()); + var drop_items = this._get_drop_items(e); e.preventDefault(); + this._remove_overlay(); + if (!drop_items) { + return; + } + this._handle_drop_items(drop_items, e) }, _on_dragenter: function(e) { - if(this._get_drop_item(e)) { - e.preventDefault(); - jQuery(e.delegateTarget).addClass(this._drag_over_class); - return false; - } + e.preventDefault(); + this._add_overlay(); + return false; }, _on_dragleave: function(e) { - jQuery(e.delegateTarget).removeClass(this._drag_over_class); + this._remove_overlay(); + e.preventDefault(); }, - _get_drop_item: function(e) { + _get_drop_items: function(e) { var self = this, dataTransfer = e.originalEvent.dataTransfer, - drop_item = null; - _.each(dataTransfer.items, function(item) { - if( + drop_items = []; + _.each(dataTransfer.files, function(item) { + if ( _.contains(self._drop_allowed_types, item.type) || _.isEmpty(self._drop_allowed_types) ) { - drop_item = item; + drop_items.push(item); } }); - return drop_item; + return drop_items; }, // eslint-disable-next-line no-unused-vars - _handle_file_drop: function(drop_file, e) { + _handle_drop_items: function(drop_items, e) { // do something here, for example call the helper function below // e is the on_load_end handler for the FileReader above, // so e.target.result contains an ArrayBuffer of the data }, - _handle_file_drop_attach: function( - drop_file, e, res_model, res_id, extra_data - ) { + _create_attachment: function(file, reader, e, res_model, res_id, extra_data) { // helper to upload an attachment and update the sidebar var self = this; return this._rpc({ model: 'ir.attachment', method: 'create', - args: [{ - 'name': drop_file.name, - 'datas': base64js.fromByteArray( - new Uint8Array(e.target.result) + args: [ + _.extend({ + name: file.name, + datas: base64js.fromByteArray( + new Uint8Array(reader.result) ), - 'datas_fname': drop_file.name, - 'res_model': res_model, - 'res_id': res_id, - }], + datas_fname: file.name, + res_model: res_model, + res_id: res_id, + }, extra_data || {}) + ], }) .then(function() { // try to find a sidebar and update it if we found one @@ -96,13 +95,58 @@ odoo.define('web_drop_target', function(require) { while(p && !p.sidebar) { p = p.getParent ? p.getParent() : null; } - if(p) { + if (p) { var sidebar = p.sidebar; - if(sidebar && _.isFunction(sidebar._onFileUploaded)) { + if (sidebar && _.isFunction(sidebar._onFileUploaded)) { sidebar._onFileUploaded(); } } }); + }, + + _file_reader_error_handler: function(e){ + console.error(e); + }, + + _handle_file_drop_attach: function( + item, e, res_model, res_id, extra_data + ) { + var self = this; + var file = item; + if (!file || !(file instanceof Blob)) { + return; + } + var reader = new FileReader(); + reader.onloadend = self.proxy( + _.partial(self._create_attachment, file, reader, e, res_model, res_id, extra_data) + ); + reader.onerror = self.proxy('_file_reader_error_handler'); + reader.readAsArrayBuffer(file); + }, + + _add_overlay: function() { + if (!this._drop_overlay){ + var o_content = jQuery('.o_content'), + view_manager = jQuery('.o_view_manager_content'); + this._drop_overlay = jQuery( + qweb.render('web_drop_target.drop_overlay') + ); + var o_content_position = o_content.position(); + this._drop_overlay.css({ + 'top': o_content_position.top, + 'left': o_content_position.left, + 'width': view_manager.width(), + 'height': view_manager.height() + }); + o_content.append(this._drop_overlay); + } + }, + + _remove_overlay: function() { + if (this._drop_overlay) { + this._drop_overlay.remove(); + this._drop_overlay = null; + } } }; @@ -111,18 +155,23 @@ odoo.define('web_drop_target', function(require) { FormController.include(_.extend(DropTargetMixin, { _get_drop_file: function() { // disable drag&drop when we're on an unsaved record - if(!this.datarecord.id) { + if (!this.datarecord.id) { return null; } return this._super.apply(this, arguments); }, - _handle_file_drop: function(drop_file, e) { - return this._handle_file_drop_attach( - drop_file, e, this.renderer.state.model, this.renderer.state.res_id - ); + _handle_drop_items: function(drop_items, e) { + var self = this; + _.each(drop_items, function(item, e) { + return self._handle_file_drop_attach( + item, e, self.renderer.state.model, + self.renderer.state.res_id + ); + }); } })); + return { 'DropTargetMixin': DropTargetMixin, }; diff --git a/web_drop_target/static/src/less/web_drop_target.less b/web_drop_target/static/src/less/web_drop_target.less new file mode 100644 index 000000000..97dc557d5 --- /dev/null +++ b/web_drop_target/static/src/less/web_drop_target.less @@ -0,0 +1,19 @@ +.o_content { + .o_drag_over{ + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 100%; + background-color: rgba(255,255,255,0.6); + border: 1px dashed #4c4c4c; + pointer-events: none; + .o_drag_over_content{ + position: relative; + top: 50%; + transform: translate(0%, -50%); + width: 100%; + text-align: center; + } + } +} diff --git a/web_drop_target/static/src/xml/widgets.xml b/web_drop_target/static/src/xml/widgets.xml new file mode 100644 index 000000000..50142051f --- /dev/null +++ b/web_drop_target/static/src/xml/widgets.xml @@ -0,0 +1,17 @@ + + + + diff --git a/web_drop_target/views/templates.xml b/web_drop_target/views/templates.xml index 318dc7ab7..850ad5a19 100644 --- a/web_drop_target/views/templates.xml +++ b/web_drop_target/views/templates.xml @@ -4,7 +4,7 @@ - +