From bd675851506aafc869ce015326f830b5bf5293c9 Mon Sep 17 00:00:00 2001 From: Guewen Baconnier Date: Wed, 25 Jul 2018 13:04:24 +0200 Subject: [PATCH] fixup! Fixes for review feedbacks --- server_environment/README.rst | 3 ++- server_environment/models/server_env_mixin.py | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/server_environment/README.rst b/server_environment/README.rst index 4435ec8..5517d0e 100644 --- a/server_environment/README.rst +++ b/server_environment/README.rst @@ -118,7 +118,8 @@ configuration files / environment variable. When the default field is used, the field is made editable on Odoo. -Note: a present key with an empty value do not fallback on the default field. +Note: empty environment keys always take precedence over default fields + Keychain integration -------------------- diff --git a/server_environment/models/server_env_mixin.py b/server_environment/models/server_env_mixin.py index dd7bcd0..c4f4503 100644 --- a/server_environment/models/server_env_mixin.py +++ b/server_environment/models/server_env_mixin.py @@ -372,7 +372,8 @@ class ServerEnvMixin(models.AbstractModel): The default value is used when there is no key for an env-computed field in the configuration files. - The field is stored in the serialized field ``server_env_defaults``. + The field is a sparse field stored in the serialized (json) field + ``server_env_defaults``. """ fieldname = self._server_env_default_fieldname(base_field.name) if not fieldname: @@ -394,7 +395,7 @@ class ServerEnvMixin(models.AbstractModel): @api.model def _setup_base(self): super()._setup_base() - for fieldname, options in self._server_env_fields.items(): + for fieldname in self._server_env_fields: field = self._fields[fieldname] self._server_env_add_default_field(field) self._server_env_transform_field_to_read_from_env(field)