From 109c08c4b1cfc179b2d0246ae2977718c7092fba Mon Sep 17 00:00:00 2001
From: Akim Juillerat <akim.juillerat@camptocamp.com>
Date: Thu, 5 Jul 2018 18:14:35 +0200
Subject: [PATCH] Make _handle_drop_items extensible to prevent multiple rpc
 calls

---
 web_drop_target/README.rst                    |  3 -
 .../static/src/js/web_drop_target.js          | 63 +++++++++++--------
 2 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/web_drop_target/README.rst b/web_drop_target/README.rst
index 1ba26d84..1e102c4a 100644
--- a/web_drop_target/README.rst
+++ b/web_drop_target/README.rst
@@ -81,11 +81,8 @@ Contributors
 ~~~~~~~~~~~~
 
 * Holger Brunn <hbrunn@therp.nl>
-<<<<<<< HEAD
 * Akim Juillerat <akim.juillerat@camptocamp.com>
-=======
 * Pablo Fuentes <pablo@studio73.es>
->>>>>>> 25dd8787... [IMP] web_drop_target: Upload multiple files
 
 Maintainers
 ~~~~~~~~~~~
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 9bddedbd..1cd63688 100644
--- a/web_drop_target/static/src/js/web_drop_target.js
+++ b/web_drop_target/static/src/js/web_drop_target.js
@@ -26,21 +26,17 @@ odoo.define('web_drop_target', function(require) {
         },
 
         _on_drop: function(e) {
-            var self = this;
             var drop_items = this._get_drop_items(e);
-            _.each(drop_items, function(drop_item) {
-                var reader = new FileReader();
-                reader.onloadend = self.proxy(
-                    _.partial(self._handle_file_drop, drop_item.getAsFile())
-                );
-                reader.readAsArrayBuffer(drop_item.getAsFile());
-            });
+            if(!drop_items) {
+                return;
+            }
             this._remove_overlay();
             e.preventDefault();
+            this._handle_drop_items(drop_items, e)
         },
 
         _on_dragenter: function(e) {
-            if(this._get_drop_items(e).length) {
+            if(this._get_drop_items(e)) {
                 e.preventDefault();
                 this._add_overlay();
                 return false;
@@ -68,29 +64,29 @@ odoo.define('web_drop_target', function(require) {
         },
 
         // 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
@@ -107,6 +103,18 @@ odoo.define('web_drop_target', function(require) {
             });
         },
 
+        _handle_file_drop_attach: function(
+            item, e, res_model, res_id, extra_data
+        ) {
+            var self = this;
+            var file = item.getAsFile();
+            var reader = new FileReader();
+            reader.onloadend = self.proxy(
+                _.partial(self._create_attachment, file, reader, e, res_model, res_id, extra_data)
+            );
+            reader.readAsArrayBuffer(file);
+        },
+
         _add_overlay: function() {
             if(!this._drop_overlay){
                 var o_content = jQuery('.o_content'),
@@ -141,13 +149,18 @@ odoo.define('web_drop_target', function(require) {
             }
             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,
     };