From 00ab78db4b75a46ba9b7f0bb41275990523bdf48 Mon Sep 17 00:00:00 2001 From: Akim Juillerat Date: Wed, 9 Oct 2019 13:11:30 +0200 Subject: [PATCH] [MIG] server_environment: Migration to 13.0 --- server_environment/README.rst | 10 +- server_environment/__init__.py | 9 +- server_environment/__manifest__.py | 2 +- .../i18n/server_environment.pot | 107 +++--------------- server_environment/models/server_env_mixin.py | 9 +- server_environment/serv_config.xml | 1 - .../{serv_config.py => server_env.py} | 0 .../static/description/index.html | 6 +- 8 files changed, 32 insertions(+), 112 deletions(-) rename server_environment/{serv_config.py => server_env.py} (100%) diff --git a/server_environment/README.rst b/server_environment/README.rst index a230714..e7d66f9 100644 --- a/server_environment/README.rst +++ b/server_environment/README.rst @@ -11,13 +11,13 @@ server configuration environment files :target: https://odoo-community.org/page/development-status :alt: Beta .. |badge2| image:: https://img.shields.io/badge/github-OCA%2Fserver--env-lightgray.png?logo=github - :target: https://github.com/OCA/server-env/tree/12.0/server_environment + :target: https://github.com/OCA/server-env/tree/13.0/server_environment :alt: OCA/server-env .. |badge3| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/server-env-12-0/server-env-12-0-server_environment + :target: https://translation.odoo-community.org/projects/server-env-13-0/server-env-13-0-server_environment :alt: Translate me on Weblate .. |badge4| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/254/12.0 + :target: https://runbot.odoo-community.org/runbot/254/13.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| @@ -180,7 +180,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. 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 -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -220,6 +220,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -This module is part of the `OCA/server-env `_ project on GitHub. +This module is part of the `OCA/server-env `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/server_environment/__init__.py b/server_environment/__init__.py index aab9a42..a098413 100644 --- a/server_environment/__init__.py +++ b/server_environment/__init__.py @@ -18,10 +18,5 @@ # ############################################################################## from . import models -# TODO when migrating to 12, fix the import of serv_config by renaming the -# file? -# Add an alias to access to the 'serv_config' module as it is shadowed -# in the following line by an import of a variable with the same name. -# We can't change the import of serv_config for backward compatibility. -from . import serv_config as server_env -from .serv_config import serv_config, setboolean +from . import server_env +from .server_env import serv_config, setboolean diff --git a/server_environment/__manifest__.py b/server_environment/__manifest__.py index e1f1d66..b6872be 100644 --- a/server_environment/__manifest__.py +++ b/server_environment/__manifest__.py @@ -4,7 +4,7 @@ { "name": "server configuration environment files", - "version": "12.0.2.0.0", + "version": "13.0.2.0.0", "depends": [ "base", "base_sparse_field", diff --git a/server_environment/i18n/server_environment.pot b/server_environment/i18n/server_environment.pot index 7b3fde6..c9e24cc 100644 --- a/server_environment/i18n/server_environment.pot +++ b/server_environment/i18n/server_environment.pot @@ -1,12 +1,12 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * server_environment +# * server_environment # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 12.0\n" +"Project-Id-Version: Odoo Server 13.0\n" "Report-Msgid-Bugs-To: \n" -"Last-Translator: <>\n" +"Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -77,81 +77,6 @@ msgstr "" msgid "View Server Environment Configuration" msgstr "" -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__custom_ged_I_ged_folder -msgid "custom_ged | ged_folder" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__external_service_I_CONSTA -msgid "external_service | CONSTA" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__external_service_I_CONSTB -msgid "external_service | CONSTB" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__external_service_I_CONSTC -msgid "external_service | CONSTC" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__external_service_ftp_I_in_path -msgid "external_service_ftp | in_path" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__external_service_ftp_I_out_path -msgid "external_service_ftp | out_path" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__external_service_ftp_I_password -msgid "external_service_ftp | password" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__external_service_ftp_I_port -msgid "external_service_ftp | port" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__external_service_ftp_I_server -msgid "external_service_ftp | server" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__external_service_ftp_I_tls -msgid "external_service_ftp | tls" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__external_service_ftp_I_user -msgid "external_service_ftp | user" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__ir_config_parameter_I_ircp_empty -msgid "ir_config_parameter | ircp_empty" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__ir_config_parameter_I_ircp_from_config -msgid "ir_config_parameter | ircp_from_config" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__misc_I_completed_state -msgid "misc | completed_state" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__misc_I_smtp_server -msgid "misc | smtp_server" -msgstr "" - #. module: server_environment #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_addons_path msgid "odoo | addons_path" @@ -332,11 +257,6 @@ msgstr "" msgid "odoo | logfile" msgstr "" -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_logrotate -msgid "odoo | logrotate" -msgstr "" - #. module: server_environment #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_longpolling_port msgid "odoo | longpolling_port" @@ -402,6 +322,16 @@ msgstr "" msgid "odoo | save" msgstr "" +#. module: server_environment +#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_screencasts +msgid "odoo | screencasts" +msgstr "" + +#. module: server_environment +#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_screenshots +msgid "odoo | screenshots" +msgstr "" + #. module: server_environment #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_server_wide_modules msgid "odoo | server_wide_modules" @@ -487,6 +417,11 @@ msgstr "" msgid "odoo | update" msgstr "" +#. module: server_environment +#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_upgrades_paths +msgid "odoo | upgrades_paths" +msgstr "" + #. module: server_environment #: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_without_demo msgid "odoo | without_demo" @@ -546,9 +481,3 @@ msgstr "" #: model:ir.model.fields,field_description:server_environment.field_server_config__system_I_version msgid "system | version" msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__wkhtml2pdf_I_lib_path -msgid "wkhtml2pdf | lib_path" -msgstr "" - diff --git a/server_environment/models/server_env_mixin.py b/server_environment/models/server_env_mixin.py index cd55277..0227bfa 100644 --- a/server_environment/models/server_env_mixin.py +++ b/server_environment/models/server_env_mixin.py @@ -8,7 +8,7 @@ from functools import partialmethod from lxml import etree from odoo import api, fields, models -from ..serv_config import serv_config +from ..server_env import serv_config _logger = logging.getLogger(__name__) @@ -162,7 +162,6 @@ class ServerEnvMixin(models.AbstractModel): """ return self._name.replace(".", "_") - @api.multi def _server_env_section_name(self): """Name of the section in the configuration files @@ -172,7 +171,6 @@ class ServerEnvMixin(models.AbstractModel): base = self._server_env_global_section_name() return ".".join((base, self.name)) - @api.multi def _server_env_read_from_config(self, field_name, config_getter): self.ensure_one() global_section_name = self._server_env_global_section_name() @@ -196,7 +194,6 @@ class ServerEnvMixin(models.AbstractModel): return False return value - @api.multi def _server_env_has_key_defined(self, field_name): self.ensure_one() global_section_name = self._server_env_global_section_name() @@ -236,8 +233,9 @@ class ServerEnvMixin(models.AbstractModel): ) if default_field: self[field_name] = self[default_field] + else: + self[field_name] = False - @api.multi def _compute_server_env(self): """Read values from environment configuration files @@ -269,7 +267,6 @@ class ServerEnvMixin(models.AbstractModel): elif default_field: record[default_field] = record[field_name] - @api.multi def _compute_server_env_is_editable(self): """Compute _is_editable values diff --git a/server_environment/serv_config.xml b/server_environment/serv_config.xml index 6109ef5..cd8c305 100644 --- a/server_environment/serv_config.xml +++ b/server_environment/serv_config.xml @@ -3,7 +3,6 @@ -

Beta OCA/server-env Translate me on Weblate Try me on Runbot

+

Beta OCA/server-env Translate me on Weblate Try me on Runbot

This module provides a way to define an environment in the main Odoo configuration file and to read some configurations from files depending on the configured environment: you define the environment in @@ -523,7 +523,7 @@ configuration file must be used.

Bugs are tracked on GitHub Issues. 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 -feedback.

+feedback.

Do not contact contributors directly about support or help with technical issues.

@@ -557,7 +557,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome

OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use.

-

This module is part of the OCA/server-env project on GitHub.

+

This module is part of the OCA/server-env project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.