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

Merge PR #1313 into 11.0 

Signed-off-by pedrobaeza
pull/1355/head
OCA-git-bot 2019-07-24 10:31:26 +00:00
parent d736ee4460 da39e95ecd
commit 2280bc7825
15 changed files with 183 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
web_drop_target/README.rst
View File

@ -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 <hbrunn@therp.nl>
* Pablo Fuentes <pablo@studio73.es>
* Akim Juillerat <akim.juillerat@camptocamp.com>
* Enric Tobella <etobella@creublanca.es>
Maintainers
~~~~~~~~~~~

6
web_drop_target/__manifest__.py
View File

@ -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',
]
}

24
web_drop_target/i18n/fr.po 100644
View File

@ -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"

8
web_drop_target/i18n/web_drop_target.pot
View File

@ -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 ""

2
web_drop_target/readme/CONTRIBUTORS.rst
View File

@ -1,2 +1,4 @@
* Holger Brunn <hbrunn@therp.nl>
* Pablo Fuentes <pablo@studio73.es>
* Akim Juillerat <akim.juillerat@camptocamp.com>
* Enric Tobella <etobella@creublanca.es>

3
web_drop_target/readme/USAGE.rst
View File

@ -2,3 +2,6 @@ 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:: /web_drop_target/static/description/screenshot.png
:alt: Screenshot

3
web_drop_target/static/description/index.html
View File

@ -393,6 +393,7 @@ ul.auto-toc {
<li>drag a file from your local computer onto an Odoo form view</li>
<li>it should become an attachment of the currently opened record</li>
</ol>
<img alt="Screenshot" src="https://raw.githubusercontent.com/web_drop_target/static/description/screenshot.png" />
</div>
<div class="section" id="development">
<h1><a class="toc-backref" href="#id2">Development</a></h1>
@ -431,7 +432,9 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
<h2><a class="toc-backref" href="#id7">Contributors</a></h2>
<ul class="simple">
<li>Holger Brunn &lt;<a class="reference external" href="mailto:hbrunn&#64;therp.nl">hbrunn&#64;therp.nl</a>&gt;</li>
<li>Pablo Fuentes &lt;<a class="reference external" href="mailto:pablo&#64;studio73.es">pablo&#64;studio73.es</a>&gt;</li>
<li>Akim Juillerat &lt;<a class="reference external" href="mailto:akim.juillerat&#64;camptocamp.com">akim.juillerat&#64;camptocamp.com</a>&gt;</li>
<li>Enric Tobella &lt;<a class="reference external" href="mailto:etobella&#64;creublanca.es">etobella&#64;creublanca.es</a>&gt;</li>
</ul>
</div>
<div class="section" id="maintainers">

BIN
web_drop_target/static/description/screenshot.png 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 220 KiB

0
web_drop_target/static/src/css/web_drop_target.css
View File

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

@ -4,16 +4,17 @@
odoo.define('web_drop_target', function(require) {
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);
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) {
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
@ -103,6 +102,51 @@ odoo.define('web_drop_target', function(require) {
}
}
});
},
_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;
}
}
};
@ -116,13 +160,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,
};

19
web_drop_target/static/src/less/web_drop_target.less 100644
View File

@ -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;
}
}
}

17
web_drop_target/static/src/xml/widgets.xml 100644
View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<template>
<t t-name="web_drop_target.drop_overlay">
<div class="o_drag_over">
<div class="o_drag_over_content">
<div>
<i class="fa fa-file-o fa-5x" aria-hidden="true"></i>
</div>
<div>
<h2>Drop your files here</h2>
</div>
</div>
</div>
</t>
</template>

2
web_drop_target/views/templates.xml
View File

@ -4,7 +4,7 @@
<xpath expr="." position="inside">
<script type="text/javascript" src="/web_drop_target/static/lib/base64js.min.js"></script>
<script type="text/javascript" src="/web_drop_target/static/src/js/web_drop_target.js"></script>
<link rel="stylesheet" href="/web_drop_target/static/src/css/web_drop_target.css"/>
<link rel="stylesheet" href="/web_drop_target/static/src/less/web_drop_target.less"/>
</xpath>
</template>
</odoo>