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

Fix Qweb templates. (#561) 

* [FIX][web_m2x_options] Fix Qweb templates.

They were trying to replace non-existing elements, and this was being logged to console:

    Can't find "a.oe_m2o_cm_button" when extending template FieldMany2One
    Can't find "span.badge" when extending template FieldMany2ManyTag

* Raise version correctly.

* [FIX] Make many2many_tags tag deletion work again

* Correct replacement of event

Instead of overwriting all events from upstream widget, better just overwrite the one you need and inherit the rest.
pull/2434/head
Jairo Llopis 2017-03-08 19:19:19 +01:00 committed by Diep Huu Hoang
parent 006861df97
commit 64ae596c27
4 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
web_m2x_options/README.rst
View File

@ -146,6 +146,7 @@ Contributors
* Nicolas JEUDY <nicolas@sudokeys.com>
* Yannick Vaucher <yannick.vaucher@camptocamp.com>
* Zakaria Makrelouf <z.makrelouf@gmail.com>
* Jairo Llopis <jairo.llopis@tecnativa.com>
Maintainer
----------

5
web_m2x_options/__openerp__.py
View File

@ -2,7 +2,7 @@
{
"name": 'web_m2x_options',
"version": "9.0.1.0.0",
"version": "9.0.1.1.0",
"depends": [
'base',
'web',
@ -12,6 +12,7 @@
],
'license': 'AGPL-3',
'data': ['views/view.xml'],
"author": "ACSONE SA/NV, 0k.io,Odoo Community Association (OCA)",
"author": "ACSONE SA/NV, 0k.io, Tecnativa, "
"Odoo Community Association (OCA)",
'installable': True,
}

10
web_m2x_options/static/src/js/form.js
View File

@ -260,13 +260,9 @@ odoo.define('web_m2x_options.web_m2x_options', function (require) {
});
form_relational.FieldMany2ManyTags.include({
events: {
'click .o_delete': function(e) {
this.remove_id($(e.target).parent().data('id'));
},
'click .badge': 'open_badge',
'mousedown .o_colorpicker span': 'update_color',
'focusout .o_colorpicker': 'close_color_picker',
init: function () {
this.events["click .badge"] = "open_badge";
return this._super.apply(this, arguments);
},
show_error_displayer: function () {
if ((typeof this.options.m2o_dialog === 'undefined' && this.can_create) ||

14
web_m2x_options/static/src/xml/base.xml
View File

@ -1,13 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2017 Jairo Llopis <jairo.llopis@tecnativa.com>
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
<templates xml:space="preserve">
<t t-extend="FieldMany2One">
<t t-jquery="a.oe_m2o_cm_button">
jQuery(this).attr('t-if', '!(widget.options.no_open || widget.options.no_open_edit)');
<t t-extend="FieldMany2One">
<t t-jquery=".oe_m2o_cm_button" t-operation="attributes">
<attribute name="t-if">!(widget.options.no_open || widget.options.no_open_edit)</attribute>
</t>
</t>
<t t-extend="FieldMany2ManyTag">
<t t-jquery="span.badge">
jQuery(this).attr('t-att-data-id', 'el[0]');
</t>
</t>
</templates>