Browse Source

[MIG] web_m2x_options: Migration to 12.0

pull/1086/head
Gusti Tammam 6 years ago
committed by Pedro M. Baeza
parent
commit
f17564d49f
  1. 10
      web_m2x_options/README.rst
  2. 7
      web_m2x_options/__manifest__.py
  3. 5
      web_m2x_options/static/src/js/form.js

10
web_m2x_options/README.rst

@ -14,13 +14,13 @@ web_m2x_options
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
:alt: License: AGPL-3 :alt: License: AGPL-3
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fweb-lightgray.png?logo=github .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fweb-lightgray.png?logo=github
:target: https://github.com/OCA/web/tree/11.0/web_m2x_options
:target: https://github.com/OCA/web/tree/12.0/web_m2x_options
:alt: OCA/web :alt: OCA/web
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
:target: https://translation.odoo-community.org/projects/web-11-0/web-11-0-web_m2x_options
:target: https://translation.odoo-community.org/projects/web-12-0/web-12-0-web_m2x_options
:alt: Translate me on Weblate :alt: Translate me on Weblate
.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
:target: https://runbot.odoo-community.org/runbot/162/11.0
:target: https://runbot.odoo-community.org/runbot/162/12.0
:alt: Try me on Runbot :alt: Try me on Runbot
|badge1| |badge2| |badge3| |badge4| |badge5| |badge1| |badge2| |badge3| |badge4| |badge5|
@ -149,7 +149,7 @@ Bug Tracker
Bugs are tracked on `GitHub Issues <https://github.com/OCA/web/issues>`_. Bugs are tracked on `GitHub Issues <https://github.com/OCA/web/issues>`_.
In case of trouble, please check there if your issue has already been reported. In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us smashing it by providing a detailed and welcomed If you spotted it first, help us smashing it by providing a detailed and welcomed
`feedback <https://github.com/OCA/web/issues/new?body=module:%20web_m2x_options%0Aversion:%2011.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
`feedback <https://github.com/OCA/web/issues/new?body=module:%20web_m2x_options%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
Do not contact contributors directly about support or help with technical issues. Do not contact contributors directly about support or help with technical issues.
@ -191,6 +191,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and mission is to support the collaborative development of Odoo features and
promote its widespread use. promote its widespread use.
This module is part of the `OCA/web <https://github.com/OCA/web/tree/11.0/web_m2x_options>`_ project on GitHub.
This module is part of the `OCA/web <https://github.com/OCA/web/tree/12.0/web_m2x_options>`_ project on GitHub.
You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

7
web_m2x_options/__manifest__.py

@ -1,7 +1,11 @@
# Copyright 2015 0k.io
# Copyright 2016 ACSONE SA/NV
# Copyright 2017 Tecnativa
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
{ {
"name": 'web_m2x_options', "name": 'web_m2x_options',
"version": "11.0.1.0.0",
"version": "12.0.1.0.0",
'category': 'Web', 'category': 'Web',
"author": "ACSONE SA/NV, " "author": "ACSONE SA/NV, "
"0k.io, " "0k.io, "
@ -10,7 +14,6 @@
'website': 'https://github.com/OCA/web', 'website': 'https://github.com/OCA/web',
'license': 'AGPL-3', 'license': 'AGPL-3',
"depends": [ "depends": [
'base',
'web', 'web',
], ],
'data': [ 'data': [

5
web_m2x_options/static/src/js/form.js

@ -353,7 +353,7 @@ odoo.define('web_m2x_options.web_m2x_options', function (require) {
} }
} }
}, },
})
});
FormFieldMany2ManyTags.include({ FormFieldMany2ManyTags.include({
events: _.extend({}, FormFieldMany2ManyTags.prototype.events, { events: _.extend({}, FormFieldMany2ManyTags.prototype.events, {
@ -368,6 +368,9 @@ odoo.define('web_m2x_options.web_m2x_options', function (require) {
this._super.apply(this, arguments); this._super.apply(this, arguments);
if (!open && !no_color_picker) { if (!open && !no_color_picker) {
this._onOpenColorPicker(event); this._onOpenColorPicker(event);
} else {
event.preventDefault();
event.stopPropagation();
} }
}, },
}); });

Loading…
Cancel
Save