diff --git a/web_tree_image/README.rst b/web_tree_image/README.rst index 40797dd9..61ae8274 100644 --- a/web_tree_image/README.rst +++ b/web_tree_image/README.rst @@ -1,4 +1,4 @@ -.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.png :alt: License: AGPL-3 ===================================== @@ -7,7 +7,7 @@ Display images and icons in tree view This module defines a tree image widget, to be used with either binary fields or (function) fields of type character. Use ``widget='image'`` in your view -definition. Optionally, set a ``height`` attribute. Default height is 16px. +definition. Optionally, set a ``width`` attribute. Default width is 30px. If you use the widget with a character field, the content of the field can be any of the following: @@ -24,8 +24,6 @@ any of the following: Usage ===== -This module defines a new widget type for tree views columns. - Set the attribute ``widget=image`` in a ``field`` tag in a tree view. You can also set ``height=`` to set the height the image will have. Note that this just sets the CSS ``max-height`` attribute, @@ -43,6 +41,7 @@ Contributors * Leonardo Donelli * Jay Vora * Meet Dholakia +* Nikul Chaudhary Maintainer ---------- @@ -52,3 +51,9 @@ Maintainer :target: https://odoo-community.org This module is maintained by the OCA. + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +To contribute to this module, please visit https://odoo-community.org. diff --git a/web_tree_image/__manifest__.py b/web_tree_image/__manifest__.py index db8f9fec..eb43f350 100644 --- a/web_tree_image/__manifest__.py +++ b/web_tree_image/__manifest__.py @@ -1,33 +1,14 @@ # -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# This module copyright (C) 2014 Therp BV (). -# copyright (C) 2015 Leonardo Donelli @ MONKSoftware -# -# Snippet from https://github.com/hsd/listview_images -# Copyright (C) 2013 Marcel van der Boom -# -# Copyright (C) 2016 Serpent Consulting Services Pvt. Ltd. +# Copyright 2014 Therp BV (). +# Copyright 2015 Leonardo Donelli @ MONKSoftware +# Copyright 2013 Marcel van der Boom +# Copyright 2016 - TODAY Serpent Consulting Services Pvt. Ltd. # () -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + { 'name': 'Show images in tree views', - 'version': '10.0.1.1.0', + 'version': '11.0.1.0.0', 'author': "Therp BV, " "MONK Software, " "Odoo Community Association (OCA), " @@ -38,9 +19,6 @@ 'depends': [ 'web', ], - 'qweb': [ - 'static/src/xml/widget.xml', - ], 'data': [ 'view/assets.xml', ], diff --git a/web_tree_image/static/src/js/tooltip.js b/web_tree_image/static/src/js/tooltip.js new file mode 100644 index 00000000..ca3ffaab --- /dev/null +++ b/web_tree_image/static/src/js/tooltip.js @@ -0,0 +1,17 @@ +odoo.define('web_tree_image.web_tree_image', function(require) { +"use strict"; + +var ListRenderer = require('web.ListRenderer'); + +ListRenderer.include({ + events: _.extend({}, ListRenderer.prototype.events, { + 'mouseover tbody tr td .o_field_image': '_onHoverRecord_img', + }), + _onHoverRecord_img: function (event) { + var img_src = $(event.currentTarget).children('.img-responsive').attr('src') + $(event.currentTarget).tooltip({ + title: "" + }); + } +}); +}) diff --git a/web_tree_image/static/src/js/web_tree_image.js b/web_tree_image/static/src/js/web_tree_image.js deleted file mode 100644 index 11b58201..00000000 --- a/web_tree_image/static/src/js/web_tree_image.js +++ /dev/null @@ -1,69 +0,0 @@ -/* - OpenERP, Open Source Management Solution - This module copyright (C) 2014 Therp BV () - (C) 2013 Marcel van der Boom - Copyright (C) 2016 Serpent Consulting Services Pvt. Ltd. - () - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . -*/ - -odoo.define('web.WebTreeImage', function (require) { - "use strict"; - var core = require('web.core'); - var session = require('web.session'); - var QWeb = core.qweb; - var list_widget_registry = core.list_widget_registry; - - var WebTreeImage = list_widget_registry.get('field.binary').extend({ - format: function (row_data, options) { - /* Return a valid img tag. For image fields, test if the - field's value contains just the binary size and retrieve - the image from the dedicated controller in that case. - Otherwise, assume a character field containing either a - stock Odoo icon name without path or extension or a fully - fledged location or data url */ - if (!row_data[this.id] || !row_data[this.id].value) { - return ''; - } - var value = row_data[this.id].value, src; - if (this.type === 'binary') { - if (value && value.substr(0, 10).indexOf(' ') === -1) { - // The media subtype (png) seems to be arbitrary - src = "data:image/png;base64," + value; - } else { - var imageArgs = { - model: options.model, - field: this.id, - id: options.id - } - if (this.resize) { - imageArgs.resize = this.resize; - } - src = session.url('/web/binary/image', imageArgs); - } - } else { - if (!/\//.test(row_data[this.id].value)) { - src = '/web/static/src/img/icons/' + row_data[this.id].value + '.png'; - } else { - src = row_data[this.id].value; - } - } - return QWeb.render('ListView.row.image', {widget: this, src: src}); - } - }); - - list_widget_registry - .add('field.image', WebTreeImage) -}); diff --git a/web_tree_image/static/src/less/common.less b/web_tree_image/static/src/less/common.less new file mode 100644 index 00000000..cc57053a --- /dev/null +++ b/web_tree_image/static/src/less/common.less @@ -0,0 +1,3 @@ +.o_image_cell .o_field_image img{ + width:30px; +} diff --git a/web_tree_image/static/src/xml/widget.xml b/web_tree_image/static/src/xml/widget.xml deleted file mode 100644 index cbd1bc0b..00000000 --- a/web_tree_image/static/src/xml/widget.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/web_tree_image/view/assets.xml b/web_tree_image/view/assets.xml index fa79d63e..9d40ab47 100644 --- a/web_tree_image/view/assets.xml +++ b/web_tree_image/view/assets.xml @@ -1,10 +1,11 @@ - - - - - + + +