Skip to content

[FIX][web_m2x_options] Fix Qweb templates. #561

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
moylop260 merged 4 commits into from
Mar 8, 2017
Merged

[FIX][web_m2x_options] Fix Qweb templates. #561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7dc3662
[FIX][web_m2x_options] Fix Qweb templates.
yajo Feb 21, 2017
0dc5db9
Raise version correctly.
yajo Feb 24, 2017
f34a3e0
[FIX] Make many2many_tags tag deletion work again
yajo Mar 3, 2017
86f5fc8
Correct replacement of event
yajo Mar 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion web_m2x_options/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ Your XML form view definition could contain::
Known issues
============

Double check that you have no inherited view that remove ``options`` you set on a field !
Double check that you have no inherited view that remove ``options`` you set on a field !
If nothing works, add a debugger in the first line of ``get_search_result method`` and enable debug mode in Odoo. When you write something in a many2one field, javascript debugger should pause. If not verify your installation.

Roadmap
Expand Down Expand Up @@ -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
----------
Expand Down
5 changes: 3 additions & 2 deletions web_m2x_options/__openerp__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

{
"name": 'web_m2x_options',
"version": "9.0.1.0.0",
"version": "9.0.1.1.0",
"depends": [
'base',
'web',
Expand All @@ -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 changes: 3 additions & 7 deletions web_m2x_options/static/src/js/form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) ||
Expand Down
16 changes: 7 additions & 9 deletions web_m2x_options/static/src/xml/base.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 t-extend="FieldMany2ManyTag">
<t t-jquery="span.badge">
jQuery(this).attr('t-att-data-id', 'el[0]');
</t>
</t>
</templates>