From ed571581c67312f2986d0d55bf404ae1ddb2ddc6 Mon Sep 17 00:00:00 2001 From: Thierry Ducrest Date: Thu, 16 Nov 2017 10:19:18 +0100 Subject: [PATCH] [MIG][11.0] server_environment_ir_config_parameter --- .../README.rst | 2 +- .../__init__.py | 0 .../__manifest__.py | 13 +++------ .../i18n}/de.po | 0 .../i18n}/es.po | 0 .../i18n}/it.po | 0 .../i18n}/nl_NL.po | 0 .../i18n}/ro.po | 0 .../models}/__init__.py | 0 .../models}/ir_config_parameter.py | 9 +++--- .../tests}/__init__.py | 0 .../tests/config_param_test.xml | 6 ++++ .../tests}/test_server_environment_ircp.py | 29 +++++++++---------- 13 files changed, 29 insertions(+), 30 deletions(-) rename README.rst => server_environment_ir_config_parameter/README.rst (97%) rename __init__.py => server_environment_ir_config_parameter/__init__.py (100%) rename __manifest__.py => server_environment_ir_config_parameter/__manifest__.py (55%) rename {i18n => server_environment_ir_config_parameter/i18n}/de.po (100%) rename {i18n => server_environment_ir_config_parameter/i18n}/es.po (100%) rename {i18n => server_environment_ir_config_parameter/i18n}/it.po (100%) rename {i18n => server_environment_ir_config_parameter/i18n}/nl_NL.po (100%) rename {i18n => server_environment_ir_config_parameter/i18n}/ro.po (100%) rename {models => server_environment_ir_config_parameter/models}/__init__.py (100%) rename {models => server_environment_ir_config_parameter/models}/ir_config_parameter.py (87%) rename {tests => server_environment_ir_config_parameter/tests}/__init__.py (100%) create mode 100644 server_environment_ir_config_parameter/tests/config_param_test.xml rename {tests => server_environment_ir_config_parameter/tests}/test_server_environment_ircp.py (83%) diff --git a/README.rst b/server_environment_ir_config_parameter/README.rst similarity index 97% rename from README.rst rename to server_environment_ir_config_parameter/README.rst index 5bfd6d6..56eac78 100644 --- a/README.rst +++ b/server_environment_ir_config_parameter/README.rst @@ -38,7 +38,7 @@ For example you can use this module in combination with web_environment_ribbon: .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/149/10.0 + :target: https://runbot.odoo-community.org/runbot/149/11.0 Known issues / Roadmap ====================== diff --git a/__init__.py b/server_environment_ir_config_parameter/__init__.py similarity index 100% rename from __init__.py rename to server_environment_ir_config_parameter/__init__.py diff --git a/__manifest__.py b/server_environment_ir_config_parameter/__manifest__.py similarity index 55% rename from __manifest__.py rename to server_environment_ir_config_parameter/__manifest__.py index a48e34a..90b1b4b 100644 --- a/__manifest__.py +++ b/server_environment_ir_config_parameter/__manifest__.py @@ -1,20 +1,15 @@ -# -*- coding: utf-8 -*- -# Copyright 2016 ACSONE SA/NV +# Copyright 2016-2018 ACSONE SA/NV # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { 'name': 'Server Environment Ir Config Parameter', 'summary': """ Override System Parameters from server environment file""", - 'version': '10.0.1.0.1', + 'version': '11.0.1.0.0', 'license': 'AGPL-3', - 'author': 'ACSONE SA/NV,Odoo Community Association (OCA)', - 'website': 'https://odoo-community.org/', + 'author': 'ACSONE SA/NV, Odoo Community Association (OCA)', + 'website': 'https://github.com/OCA/server-env/', 'depends': [ 'server_environment', ], - 'data': [ - ], - 'demo': [ - ], } diff --git a/i18n/de.po b/server_environment_ir_config_parameter/i18n/de.po similarity index 100% rename from i18n/de.po rename to server_environment_ir_config_parameter/i18n/de.po diff --git a/i18n/es.po b/server_environment_ir_config_parameter/i18n/es.po similarity index 100% rename from i18n/es.po rename to server_environment_ir_config_parameter/i18n/es.po diff --git a/i18n/it.po b/server_environment_ir_config_parameter/i18n/it.po similarity index 100% rename from i18n/it.po rename to server_environment_ir_config_parameter/i18n/it.po diff --git a/i18n/nl_NL.po b/server_environment_ir_config_parameter/i18n/nl_NL.po similarity index 100% rename from i18n/nl_NL.po rename to server_environment_ir_config_parameter/i18n/nl_NL.po diff --git a/i18n/ro.po b/server_environment_ir_config_parameter/i18n/ro.po similarity index 100% rename from i18n/ro.po rename to server_environment_ir_config_parameter/i18n/ro.po diff --git a/models/__init__.py b/server_environment_ir_config_parameter/models/__init__.py similarity index 100% rename from models/__init__.py rename to server_environment_ir_config_parameter/models/__init__.py diff --git a/models/ir_config_parameter.py b/server_environment_ir_config_parameter/models/ir_config_parameter.py similarity index 87% rename from models/ir_config_parameter.py rename to server_environment_ir_config_parameter/models/ir_config_parameter.py index 4017fdd..29ddc44 100644 --- a/models/ir_config_parameter.py +++ b/server_environment_ir_config_parameter/models/ir_config_parameter.py @@ -1,5 +1,4 @@ -# -*- coding: utf-8 -*- -# Copyright 2016 ACSONE SA/NV +# Copyright 2016-2018 ACSONE SA/NV # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from odoo import api, models, _ @@ -16,7 +15,7 @@ class IrConfigParameter(models.Model): @api.model def get_param(self, key, default=False): - value = super(IrConfigParameter, self).get_param(key, default=None) + value = super().get_param(key, default=None) if serv_config.has_option(SECTION, key): cvalue = serv_config.get(SECTION, key) if not cvalue: @@ -40,7 +39,7 @@ class IrConfigParameter(models.Model): if serv_config.has_option(SECTION, key): # enforce value from config file vals = dict(vals, value=serv_config.get(SECTION, key)) - return super(IrConfigParameter, self).create(vals) + return super().create(vals) @api.multi def write(self, vals): @@ -51,5 +50,5 @@ class IrConfigParameter(models.Model): newvals = dict(vals, value=serv_config.get(SECTION, key)) else: newvals = vals - super(IrConfigParameter, rec).write(newvals) + super().write(newvals) return True diff --git a/tests/__init__.py b/server_environment_ir_config_parameter/tests/__init__.py similarity index 100% rename from tests/__init__.py rename to server_environment_ir_config_parameter/tests/__init__.py diff --git a/server_environment_ir_config_parameter/tests/config_param_test.xml b/server_environment_ir_config_parameter/tests/config_param_test.xml new file mode 100644 index 0000000..61303a8 --- /dev/null +++ b/server_environment_ir_config_parameter/tests/config_param_test.xml @@ -0,0 +1,6 @@ + + + ircp_from_config + value_from_xml + + diff --git a/tests/test_server_environment_ircp.py b/server_environment_ir_config_parameter/tests/test_server_environment_ircp.py similarity index 83% rename from tests/test_server_environment_ircp.py rename to server_environment_ir_config_parameter/tests/test_server_environment_ircp.py index bcffa9c..8843f79 100644 --- a/tests/test_server_environment_ircp.py +++ b/server_environment_ir_config_parameter/tests/test_server_environment_ircp.py @@ -1,20 +1,24 @@ -# -*- coding: utf-8 -*- -# Copyright 2016 ACSONE SA/NV +# Copyright 2016-2018 ACSONE SA/NV # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from cStringIO import StringIO - from odoo.exceptions import UserError from odoo.tests import common -from odoo.tools import convert +from odoo.tools import convert_file +from odoo.modules.module import get_resource_path class TestEnv(common.TransactionCase): def setUp(self): - super(TestEnv, self).setUp() + super().setUp() self.ICP = self.env['ir.config_parameter'] + def _load_xml(self, module, filepath): + convert_file( + self.env.cr, module, + get_resource_path(module, filepath), + {}, mode='init', noupdate=False, kind='test') + def test_get_param(self): """ Get system parameter from config """ # it's not in db @@ -68,14 +72,9 @@ class TestEnv(common.TransactionCase): self.assertEqual(self.ICP.get_param('ircp_nonexistant'), False) def test_override_xmldata(self): - xml = """ - - - ircp_from_config - value_from_xml - - - """ - convert.convert_xml_import(self.env.cr, 'testmodule', StringIO(xml)) + self._load_xml( + 'server_environment_ir_config_parameter', + 'tests/config_param_test.xml' + ) value = self.ICP.get_param('ircp_from_config') self.assertEqual(value, 'config_value')