From 2cdf7d090ef2668cb0873841b484cade8132a7dc Mon Sep 17 00:00:00 2001 From: nguyenhk Date: Tue, 21 Dec 2021 10:22:55 +0700 Subject: [PATCH] [FIX] web_m2x_options: fix test_ir_config_parameter --- web_m2x_options/README.rst | 4 +-- web_m2x_options/__manifest__.py | 2 +- web_m2x_options/i18n/ar.po | 4 ++- web_m2x_options/i18n/de.po | 9 +++-- web_m2x_options/i18n/es.po | 4 ++- web_m2x_options/i18n/fi.po | 4 ++- web_m2x_options/i18n/fr.po | 9 +++-- web_m2x_options/i18n/hr.po | 12 +++++-- web_m2x_options/i18n/it.po | 4 ++- web_m2x_options/i18n/nl.po | 33 +++++++++---------- web_m2x_options/i18n/nl_NL.po | 4 ++- web_m2x_options/i18n/pt_BR.po | 9 +++-- web_m2x_options/i18n/sl.po | 4 ++- web_m2x_options/i18n/tr.po | 4 ++- web_m2x_options/i18n/web_m2x_options.pot | 4 ++- web_m2x_options/i18n/zh_CN.po | 9 +++-- web_m2x_options/models/ir_config_parameter.py | 6 ++-- .../tests/test_ir_config_parameter.py | 16 ++++----- 18 files changed, 89 insertions(+), 52 deletions(-) diff --git a/web_m2x_options/README.rst b/web_m2x_options/README.rst index 966303a60..66002974a 100644 --- a/web_m2x_options/README.rst +++ b/web_m2x_options/README.rst @@ -23,7 +23,7 @@ web_m2x_options :target: https://runbot.odoo-community.org/runbot/162/15.0 :alt: Try me on Runbot -|badge1| |badge2| |badge3| |badge4| |badge5| +|badge1| |badge2| |badge3| |badge4| |badge5| This modules modifies "many2one" and "many2manytags" form widgets so as to add some new display control options. @@ -83,7 +83,7 @@ in the field's options dict ``open`` *boolean* (Default: ``False``) - Makes many2many_tags buttons that open the linked resource + Makes many2many_tags and one2many rows buttons that open the linked resource ``no_color_picker`` *boolean* (Default: ``False``) diff --git a/web_m2x_options/__manifest__.py b/web_m2x_options/__manifest__.py index d865feb56..af30beb4b 100644 --- a/web_m2x_options/__manifest__.py +++ b/web_m2x_options/__manifest__.py @@ -6,7 +6,7 @@ { "name": "web_m2x_options", - "version": "15.0.1.0.0", + "version": "15.0.1.1.0", "category": "Web", "author": "initOS GmbH," "ACSONE SA/NV, " diff --git a/web_m2x_options/i18n/ar.po b/web_m2x_options/i18n/ar.po index ea3229ca9..62382cfe8 100644 --- a/web_m2x_options/i18n/ar.po +++ b/web_m2x_options/i18n/ar.po @@ -23,7 +23,9 @@ msgstr "" #. openerp-web #: code:addons/web_m2x_options/static/src/xml/base.xml:0 #, python-format -msgid "!(widget.nodeOptions.no_open || widget.nodeOptions.no_open_edit)" +msgid "" +"!(widget.nodeOptions.no_open || widget.nodeOptions.no_open_edit || widget." +"noOpen)" msgstr "" #. module: web_m2x_options diff --git a/web_m2x_options/i18n/de.po b/web_m2x_options/i18n/de.po index ee0660aa1..d6d9e4750 100644 --- a/web_m2x_options/i18n/de.po +++ b/web_m2x_options/i18n/de.po @@ -24,8 +24,10 @@ msgstr "" #. openerp-web #: code:addons/web_m2x_options/static/src/xml/base.xml:0 #, python-format -msgid "!(widget.nodeOptions.no_open || widget.nodeOptions.no_open_edit)" -msgstr "!(widget.nodeOptions.no_open || widget.nodeOptions.no_open_edit)" +msgid "" +"!(widget.nodeOptions.no_open || widget.nodeOptions.no_open_edit || widget." +"noOpen)" +msgstr "" #. module: web_m2x_options #. openerp-web @@ -110,3 +112,6 @@ msgid "You are creating a new %s, are you sure it does not exist yet?" msgstr "" "Sie legen eine neue %s an, sind Sie sicher, dass diese nicht bereits " "vorhanden ist?" + +#~ msgid "!(widget.nodeOptions.no_open || widget.nodeOptions.no_open_edit)" +#~ msgstr "!(widget.nodeOptions.no_open || widget.nodeOptions.no_open_edit)" diff --git a/web_m2x_options/i18n/es.po b/web_m2x_options/i18n/es.po index e521ea709..7a5a8a700 100644 --- a/web_m2x_options/i18n/es.po +++ b/web_m2x_options/i18n/es.po @@ -22,7 +22,9 @@ msgstr "" #. openerp-web #: code:addons/web_m2x_options/static/src/xml/base.xml:0 #, python-format -msgid "!(widget.nodeOptions.no_open || widget.nodeOptions.no_open_edit)" +msgid "" +"!(widget.nodeOptions.no_open || widget.nodeOptions.no_open_edit || widget." +"noOpen)" msgstr "" #. module: web_m2x_options diff --git a/web_m2x_options/i18n/fi.po b/web_m2x_options/i18n/fi.po index 00da90fa7..d5133f1e3 100644 --- a/web_m2x_options/i18n/fi.po +++ b/web_m2x_options/i18n/fi.po @@ -22,7 +22,9 @@ msgstr "" #. openerp-web #: code:addons/web_m2x_options/static/src/xml/base.xml:0 #, python-format -msgid "!(widget.nodeOptions.no_open || widget.nodeOptions.no_open_edit)" +msgid "" +"!(widget.nodeOptions.no_open || widget.nodeOptions.no_open_edit || widget." +"noOpen)" msgstr "" #. module: web_m2x_options diff --git a/web_m2x_options/i18n/fr.po b/web_m2x_options/i18n/fr.po index 7799d7a3d..ebba120f5 100644 --- a/web_m2x_options/i18n/fr.po +++ b/web_m2x_options/i18n/fr.po @@ -23,8 +23,10 @@ msgstr "" #. openerp-web #: code:addons/web_m2x_options/static/src/xml/base.xml:0 #, python-format -msgid "!(widget.nodeOptions.no_open || widget.nodeOptions.no_open_edit)" -msgstr "!(widget.nodeOptions.no_open || widget.nodeOptions.no_open_edit)" +msgid "" +"!(widget.nodeOptions.no_open || widget.nodeOptions.no_open_edit || widget." +"noOpen)" +msgstr "" #. module: web_m2x_options #. openerp-web @@ -108,3 +110,6 @@ msgstr "Paramètres système" msgid "You are creating a new %s, are you sure it does not exist yet?" msgstr "" "Vous créez un nouveau %s, est-ce que vous êtes sur qu'il n'existe pas déjà ?" + +#~ msgid "!(widget.nodeOptions.no_open || widget.nodeOptions.no_open_edit)" +#~ msgstr "!(widget.nodeOptions.no_open || widget.nodeOptions.no_open_edit)" diff --git a/web_m2x_options/i18n/hr.po b/web_m2x_options/i18n/hr.po index 422a6f0b4..2bba4de1a 100644 --- a/web_m2x_options/i18n/hr.po +++ b/web_m2x_options/i18n/hr.po @@ -23,9 +23,11 @@ msgstr "" #. module: web_m2x_options #. openerp-web #: code:addons/web_m2x_options/static/src/xml/base.xml:0 -#, fuzzy, python-format -msgid "!(widget.nodeOptions.no_open || widget.nodeOptions.no_open_edit)" -msgstr "!(opcije isključuju otvaranje ili uređivanje)" +#, python-format +msgid "" +"!(widget.nodeOptions.no_open || widget.nodeOptions.no_open_edit || widget." +"noOpen)" +msgstr "" #. module: web_m2x_options #. openerp-web @@ -108,3 +110,7 @@ msgstr "" #, python-format msgid "You are creating a new %s, are you sure it does not exist yet?" msgstr "Želite kreirati novi %s, jeste li sigurni da već ne postoji?" + +#, fuzzy +#~ msgid "!(widget.nodeOptions.no_open || widget.nodeOptions.no_open_edit)" +#~ msgstr "!(opcije isključuju otvaranje ili uređivanje)" diff --git a/web_m2x_options/i18n/it.po b/web_m2x_options/i18n/it.po index b46d50fd9..90f63f9ad 100644 --- a/web_m2x_options/i18n/it.po +++ b/web_m2x_options/i18n/it.po @@ -22,7 +22,9 @@ msgstr "" #. openerp-web #: code:addons/web_m2x_options/static/src/xml/base.xml:0 #, python-format -msgid "!(widget.nodeOptions.no_open || widget.nodeOptions.no_open_edit)" +msgid "" +"!(widget.nodeOptions.no_open || widget.nodeOptions.no_open_edit || widget." +"noOpen)" msgstr "" #. module: web_m2x_options diff --git a/web_m2x_options/i18n/nl.po b/web_m2x_options/i18n/nl.po index 2abfcf74f..760ed10d3 100644 --- a/web_m2x_options/i18n/nl.po +++ b/web_m2x_options/i18n/nl.po @@ -20,8 +20,10 @@ msgstr "" #. openerp-web #: code:addons/web_m2x_options/static/src/xml/base.xml:0 #, python-format -msgid "!(widget.nodeOptions.no_open || widget.nodeOptions.no_open_edit)" -msgstr "!(widget.nodeOptions.no_open || widget.nodeOptions.no_open_edit)" +msgid "" +"!(widget.nodeOptions.no_open || widget.nodeOptions.no_open_edit || widget." +"noOpen)" +msgstr "" #. module: web_m2x_options #. openerp-web @@ -65,21 +67,6 @@ msgstr "Aanmaken en bewerken..." msgid "Create and edit" msgstr "Aanmaken en bewerken" -#. module: web_m2x_options -#: model:ir.model.fields,field_description:web_m2x_options.field_ir_config_parameter__display_name -msgid "Display Name" -msgstr "Weergavenaam" - -#. module: web_m2x_options -#: model:ir.model.fields,field_description:web_m2x_options.field_ir_config_parameter__id -msgid "ID" -msgstr "ID" - -#. module: web_m2x_options -#: model:ir.model.fields,field_description:web_m2x_options.field_ir_config_parameter____last_update -msgid "Last Modified on" -msgstr "Laatst Gewijzigd op" - #. module: web_m2x_options #. openerp-web #: code:addons/web_m2x_options/static/src/js/form.js:0 @@ -119,3 +106,15 @@ msgstr "Systeem Parameter" #, python-format msgid "You are creating a new %s, are you sure it does not exist yet?" msgstr "U maakt een nieuw %s, weet u het zeker dat dit nog niet bestaat?" + +#~ msgid "!(widget.nodeOptions.no_open || widget.nodeOptions.no_open_edit)" +#~ msgstr "!(widget.nodeOptions.no_open || widget.nodeOptions.no_open_edit)" + +#~ msgid "Display Name" +#~ msgstr "Weergavenaam" + +#~ msgid "ID" +#~ msgstr "ID" + +#~ msgid "Last Modified on" +#~ msgstr "Laatst Gewijzigd op" diff --git a/web_m2x_options/i18n/nl_NL.po b/web_m2x_options/i18n/nl_NL.po index 2858f962a..e8a781627 100644 --- a/web_m2x_options/i18n/nl_NL.po +++ b/web_m2x_options/i18n/nl_NL.po @@ -23,7 +23,9 @@ msgstr "" #. openerp-web #: code:addons/web_m2x_options/static/src/xml/base.xml:0 #, python-format -msgid "!(widget.nodeOptions.no_open || widget.nodeOptions.no_open_edit)" +msgid "" +"!(widget.nodeOptions.no_open || widget.nodeOptions.no_open_edit || widget." +"noOpen)" msgstr "" #. module: web_m2x_options diff --git a/web_m2x_options/i18n/pt_BR.po b/web_m2x_options/i18n/pt_BR.po index 2d1f35139..d418e5650 100644 --- a/web_m2x_options/i18n/pt_BR.po +++ b/web_m2x_options/i18n/pt_BR.po @@ -25,8 +25,10 @@ msgstr "" #. openerp-web #: code:addons/web_m2x_options/static/src/xml/base.xml:0 #, python-format -msgid "!(widget.nodeOptions.no_open || widget.nodeOptions.no_open_edit)" -msgstr "!(widget.options.no_open || widget.nodeOptions.no_open_edit)" +msgid "" +"!(widget.nodeOptions.no_open || widget.nodeOptions.no_open_edit || widget." +"noOpen)" +msgstr "" #. module: web_m2x_options #. openerp-web @@ -110,3 +112,6 @@ msgstr "Parâmetros do Sistema" msgid "You are creating a new %s, are you sure it does not exist yet?" msgstr "" "Você está criando um novo %s, você tem certeza de que ainda não existe?" + +#~ msgid "!(widget.nodeOptions.no_open || widget.nodeOptions.no_open_edit)" +#~ msgstr "!(widget.options.no_open || widget.nodeOptions.no_open_edit)" diff --git a/web_m2x_options/i18n/sl.po b/web_m2x_options/i18n/sl.po index 7f6e68d71..50735e948 100644 --- a/web_m2x_options/i18n/sl.po +++ b/web_m2x_options/i18n/sl.po @@ -23,7 +23,9 @@ msgstr "" #. openerp-web #: code:addons/web_m2x_options/static/src/xml/base.xml:0 #, python-format -msgid "!(widget.nodeOptions.no_open || widget.nodeOptions.no_open_edit)" +msgid "" +"!(widget.nodeOptions.no_open || widget.nodeOptions.no_open_edit || widget." +"noOpen)" msgstr "" #. module: web_m2x_options diff --git a/web_m2x_options/i18n/tr.po b/web_m2x_options/i18n/tr.po index 975fcfee4..3d7743834 100644 --- a/web_m2x_options/i18n/tr.po +++ b/web_m2x_options/i18n/tr.po @@ -22,7 +22,9 @@ msgstr "" #. openerp-web #: code:addons/web_m2x_options/static/src/xml/base.xml:0 #, python-format -msgid "!(widget.nodeOptions.no_open || widget.nodeOptions.no_open_edit)" +msgid "" +"!(widget.nodeOptions.no_open || widget.nodeOptions.no_open_edit || widget." +"noOpen)" msgstr "" #. module: web_m2x_options diff --git a/web_m2x_options/i18n/web_m2x_options.pot b/web_m2x_options/i18n/web_m2x_options.pot index 2f0888dd5..50637f9b4 100644 --- a/web_m2x_options/i18n/web_m2x_options.pot +++ b/web_m2x_options/i18n/web_m2x_options.pot @@ -17,7 +17,9 @@ msgstr "" #. openerp-web #: code:addons/web_m2x_options/static/src/xml/base.xml:0 #, python-format -msgid "!(widget.nodeOptions.no_open || widget.nodeOptions.no_open_edit)" +msgid "" +"!(widget.nodeOptions.no_open || widget.nodeOptions.no_open_edit || " +"widget.noOpen)" msgstr "" #. module: web_m2x_options diff --git a/web_m2x_options/i18n/zh_CN.po b/web_m2x_options/i18n/zh_CN.po index d5363a58b..74561160b 100644 --- a/web_m2x_options/i18n/zh_CN.po +++ b/web_m2x_options/i18n/zh_CN.po @@ -20,8 +20,10 @@ msgstr "" #. openerp-web #: code:addons/web_m2x_options/static/src/xml/base.xml:0 #, python-format -msgid "!(widget.nodeOptions.no_open || widget.nodeOptions.no_open_edit)" -msgstr "!(widget.nodeOptions.no_open || widget.nodeOptions.no_open_edit)" +msgid "" +"!(widget.nodeOptions.no_open || widget.nodeOptions.no_open_edit || widget." +"noOpen)" +msgstr "" #. module: web_m2x_options #. openerp-web @@ -104,3 +106,6 @@ msgstr "系统参数" #, python-format msgid "You are creating a new %s, are you sure it does not exist yet?" msgstr "你正在创建一个新的%s，你确定它还不存在吗？" + +#~ msgid "!(widget.nodeOptions.no_open || widget.nodeOptions.no_open_edit)" +#~ msgstr "!(widget.nodeOptions.no_open || widget.nodeOptions.no_open_edit)" diff --git a/web_m2x_options/models/ir_config_parameter.py b/web_m2x_options/models/ir_config_parameter.py index f6d7b17f7..c24506dd8 100644 --- a/web_m2x_options/models/ir_config_parameter.py +++ b/web_m2x_options/models/ir_config_parameter.py @@ -14,7 +14,5 @@ class IrConfigParameter(models.Model): "web_m2x_options.m2o_dialog", "web_m2x_options.field_limit_entries", ] - return { - res["key"]: res["value"] - for res in self.sudo().search_read([["key", "in", opts]], ["key", "value"]) - } + values = self.sudo().search_read([["key", "in", opts]], ["key", "value"]) + return {res["key"]: res["value"] for res in values} diff --git a/web_m2x_options/tests/test_ir_config_parameter.py b/web_m2x_options/tests/test_ir_config_parameter.py index d4262a252..eae00c7a9 100644 --- a/web_m2x_options/tests/test_ir_config_parameter.py +++ b/web_m2x_options/tests/test_ir_config_parameter.py @@ -16,15 +16,13 @@ class TestIrConfigParameter(common.TransactionCase): def test_web_m2x_options_key(self): web_m2x_options = self.env["ir.config_parameter"].get_web_m2x_options() - options = {opt["key"]: opt["value"] for opt in web_m2x_options} - self.assertIn("web_m2x_options.limit", options) - self.assertNotIn("web_m2x_options.m2o_dialog_test", options) + self.assertIn("web_m2x_options.limit", web_m2x_options) + self.assertNotIn("web_m2x_options.m2o_dialog_test", web_m2x_options) def test_web_m2x_options_value(self): web_m2x_options = self.env["ir.config_parameter"].get_web_m2x_options() - options = {opt["key"]: opt["value"] for opt in web_m2x_options} - self.assertEqual(options["web_m2x_options.limit"], "10") - self.assertTrue(bool(options["web_m2x_options.create_edit"])) - self.assertTrue(bool(options["web_m2x_options.create"])) - self.assertEqual(options["web_m2x_options.search_more"], "False") - self.assertTrue(bool(options["web_m2x_options.m2o_dialog"])) + self.assertEqual(web_m2x_options["web_m2x_options.limit"], "10") + self.assertTrue(bool(web_m2x_options["web_m2x_options.create_edit"])) + self.assertTrue(bool(web_m2x_options["web_m2x_options.create"])) + self.assertEqual(web_m2x_options["web_m2x_options.search_more"], "False") + self.assertTrue(bool(web_m2x_options["web_m2x_options.m2o_dialog"]))