diff --git a/server_environment/README.rst b/server_environment/README.rst index 75279dc..20c5f7c 100644 --- a/server_environment/README.rst +++ b/server_environment/README.rst @@ -10,17 +10,20 @@ server configuration environment files .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png :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/14.0/server_environment +.. |badge2| image:: https://img.shields.io/badge/licence-LGPL--3-blue.png + :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html + :alt: License: LGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fserver--env-lightgray.png?logo=github + :target: https://github.com/OCA/server-env/tree/15.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-14-0/server-env-14-0-server_environment +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/server-env-15-0/server-env-15-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/14.0 +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/254/15.0 :alt: Try me on Runbot -|badge1| |badge2| |badge3| |badge4| +|badge1| |badge2| |badge3| |badge4| |badge5| This module provides a way to define an environment in the main Odoo configuration file and to read some configurations from files @@ -201,7 +204,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. @@ -242,6 +245,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/__manifest__.py b/server_environment/__manifest__.py index 334e087..7f1336e 100644 --- a/server_environment/__manifest__.py +++ b/server_environment/__manifest__.py @@ -4,7 +4,7 @@ { "name": "server configuration environment files", - "version": "14.0.1.0.0", + "version": "15.0.1.0.0", "depends": ["base", "base_sparse_field"], "author": "Camptocamp,Odoo Community Association (OCA)", "summary": "move some configurations out of the database", diff --git a/server_environment/i18n/server_environment.pot b/server_environment/i18n/server_environment.pot index 1e8a588..40735d7 100644 --- a/server_environment/i18n/server_environment.pot +++ b/server_environment/i18n/server_environment.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 14.0\n" +"Project-Id-Version: Odoo Server 15.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: \n" "Language-Team: \n" @@ -30,8 +30,6 @@ msgstr "" #. module: server_environment #: model:ir.model.fields,field_description:server_environment.field_server_config__display_name -#: model:ir.model.fields,field_description:server_environment.field_server_env_mixin__display_name -#: model:ir.model.fields,field_description:server_environment.field_server_env_techname_mixin__display_name msgid "Display Name" msgstr "" @@ -42,15 +40,11 @@ msgstr "" #. module: server_environment #: model:ir.model.fields,field_description:server_environment.field_server_config__id -#: model:ir.model.fields,field_description:server_environment.field_server_env_mixin__id -#: model:ir.model.fields,field_description:server_environment.field_server_env_techname_mixin__id msgid "ID" msgstr "" #. module: server_environment #: model:ir.model.fields,field_description:server_environment.field_server_config____last_update -#: model:ir.model.fields,field_description:server_environment.field_server_env_mixin____last_update -#: model:ir.model.fields,field_description:server_environment.field_server_env_techname_mixin____last_update msgid "Last Modified on" msgstr "" @@ -104,413 +98,3 @@ msgstr "" #: model:ir.model.constraint,message:server_environment.constraint_server_env_techname_mixin_tech_name_uniq msgid "`tech_name` must be unique!" msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_addons_path -msgid "odoo | addons_path" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_admin_passwd -msgid "odoo | admin_passwd" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_config -msgid "odoo | config" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_csv_internal_sep -msgid "odoo | csv_internal_sep" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_data_dir -msgid "odoo | data_dir" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_db_host -msgid "odoo | db_host" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_db_maxconn -msgid "odoo | db_maxconn" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_db_name -msgid "odoo | db_name" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_db_password -msgid "odoo | db_password" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_db_port -msgid "odoo | db_port" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_db_sslmode -msgid "odoo | db_sslmode" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_db_template -msgid "odoo | db_template" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_db_user -msgid "odoo | db_user" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_dbfilter -msgid "odoo | dbfilter" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_demo -msgid "odoo | demo" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_dev_mode -msgid "odoo | dev_mode" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_email_from -msgid "odoo | email_from" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_geoip_database -msgid "odoo | geoip_database" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_http_enable -msgid "odoo | http_enable" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_http_interface -msgid "odoo | http_interface" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_http_port -msgid "odoo | http_port" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_import_partial -msgid "odoo | import_partial" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_init -msgid "odoo | init" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_language -msgid "odoo | language" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_limit_memory_hard -msgid "odoo | limit_memory_hard" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_limit_memory_soft -msgid "odoo | limit_memory_soft" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_limit_request -msgid "odoo | limit_request" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_limit_time_cpu -msgid "odoo | limit_time_cpu" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_limit_time_real -msgid "odoo | limit_time_real" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_limit_time_real_cron -msgid "odoo | limit_time_real_cron" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_list_db -msgid "odoo | list_db" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_log_db -msgid "odoo | log_db" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_log_db_level -msgid "odoo | log_db_level" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_log_handler -msgid "odoo | log_handler" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_log_level -msgid "odoo | log_level" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_logfile -msgid "odoo | logfile" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_longpolling_port -msgid "odoo | longpolling_port" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_max_cron_threads -msgid "odoo | max_cron_threads" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_osv_memory_age_limit -msgid "odoo | osv_memory_age_limit" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_osv_memory_count_limit -msgid "odoo | osv_memory_count_limit" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_overwrite_existing_translations -msgid "odoo | overwrite_existing_translations" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_pg_path -msgid "odoo | pg_path" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_pidfile -msgid "odoo | pidfile" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_proxy_mode -msgid "odoo | proxy_mode" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_publisher_warranty_url -msgid "odoo | publisher_warranty_url" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_reportgz -msgid "odoo | reportgz" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_root_path -msgid "odoo | root_path" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_running_env -msgid "odoo | running_env" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_save -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" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_shell_interface -msgid "odoo | shell_interface" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_password -msgid "odoo | smtp_password" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_port -msgid "odoo | smtp_port" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_server -msgid "odoo | smtp_server" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_ssl -msgid "odoo | smtp_ssl" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_smtp_user -msgid "odoo | smtp_user" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_stop_after_init -msgid "odoo | stop_after_init" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_syslog -msgid "odoo | syslog" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_test_enable -msgid "odoo | test_enable" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_test_file -msgid "odoo | test_file" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_test_tags -msgid "odoo | test_tags" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_transient_age_limit -msgid "odoo | transient_age_limit" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_translate_in -msgid "odoo | translate_in" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_translate_modules -msgid "odoo | translate_modules" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_translate_out -msgid "odoo | translate_out" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_unaccent -msgid "odoo | unaccent" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_update -msgid "odoo | update" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_upgrade_path -msgid "odoo | upgrade_path" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_without_demo -msgid "odoo | without_demo" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__odoo_I_workers -msgid "odoo | workers" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__system_I_architecture -msgid "system | architecture" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__system_I_locale -msgid "system | locale" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__system_I_lsb_release -msgid "system | lsb_release" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__system_I_odoo -msgid "system | odoo" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__system_I_os_name -msgid "system | os_name" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__system_I_platform -msgid "system | platform" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__system_I_python -msgid "system | python" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__system_I_release -msgid "system | release" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__system_I_revision -msgid "system | revision" -msgstr "" - -#. module: server_environment -#: model:ir.model.fields,field_description:server_environment.field_server_config__system_I_version -msgid "system | version" -msgstr "" diff --git a/server_environment/models/server_env_mixin.py b/server_environment/models/server_env_mixin.py index 112e675..1463ae3 100644 --- a/server_environment/models/server_env_mixin.py +++ b/server_environment/models/server_env_mixin.py @@ -393,3 +393,4 @@ class ServerEnvMixin(models.AbstractModel): self._server_env_add_default_field(field) self._server_env_transform_field_to_read_from_env(field) self._server_env_add_is_editable_field(field) + return diff --git a/server_environment/server_env.py b/server_environment/server_env.py index d291609..a2a7206 100644 --- a/server_environment/server_env.py +++ b/server_environment/server_env.py @@ -111,7 +111,9 @@ def _load_config_from_server_env_files(config_p): try: config_p.read(conf_files) except Exception as e: - raise Exception('Cannot read config files "{}": {}'.format(conf_files, e)) + raise Exception( + 'Cannot read config files "{}": {}'.format(conf_files, e) + ) from e def _load_config_from_rcfile(config_p): @@ -128,7 +130,7 @@ def _load_config_from_env(config_p): except configparser.Error as err: raise Exception( "{} content could not be parsed: {}".format(varname, err) - ) + ) from err def _load_config(): @@ -213,7 +215,7 @@ class ServerConfiguration(models.TransientModel): @classmethod def _get_base_cols(cls): - """ Compute base fields""" + """Compute base fields""" res = {} for col, item in list(system_base_config.options.items()): key = cls._format_key("odoo", col) @@ -222,7 +224,7 @@ class ServerConfiguration(models.TransientModel): @classmethod def _get_env_cols(cls, sections=None): - """ Compute base fields""" + """Compute base fields""" res = {} sections = sections if sections else serv_config.sections() for section in sections: @@ -233,7 +235,7 @@ class ServerConfiguration(models.TransientModel): @classmethod def _get_system_cols(cls): - """ Compute system fields""" + """Compute system fields""" res = {} for col, item in get_server_environment(): key = cls._format_key("system", col) @@ -316,6 +318,8 @@ class ServerConfiguration(models.TransientModel): ): return res for key in self._conf_defaults: + if key not in fields_list: + continue if not self.show_passwords and self._is_secret(key=key): res[key] = "**********" else: diff --git a/server_environment/static/description/index.html b/server_environment/static/description/index.html index c75433e..4123f3f 100644 --- a/server_environment/static/description/index.html +++ b/server_environment/static/description/index.html @@ -367,7 +367,7 @@ ul.auto-toc { !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

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

+

Beta License: LGPL-3 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 @@ -540,7 +540,7 @@ for computable / writable fields and get rid of some onchange / read / write cod

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.

@@ -575,7 +575,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.

diff --git a/server_environment/tests/common.py b/server_environment/tests/common.py index 7e13ac0..798895e 100644 --- a/server_environment/tests/common.py +++ b/server_environment/tests/common.py @@ -11,7 +11,7 @@ import odoo.addons.server_environment.models.server_env_mixin as server_env_mixi from odoo.addons.server_environment import server_env -class ServerEnvironmentCase(common.SavepointCase): +class ServerEnvironmentCase(common.TransactionCase): @contextmanager def set_config_dir(self, path): original_dir = server_env._dir diff --git a/server_environment/tests/test_server_environment.py b/server_environment/tests/test_server_environment.py index 0abc84a..2dc4fa1 100644 --- a/server_environment/tests/test_server_environment.py +++ b/server_environment/tests/test_server_environment.py @@ -18,7 +18,9 @@ class TestEnv(common.ServerEnvironmentCase): def _test_default(self, hidden_pwd=False): model = self.env["server.config"] rec = model.create({}) - defaults = rec.default_get([]) + fields = model.fields_view_get()["fields"] + self.assertTrue(fields) + defaults = rec.default_get(list(fields)) self.assertTrue(defaults) self.assertIsInstance(defaults, dict) pass_checked = False