[MIG] server_environment: migration to 15.0
This commit is contained in:
parent
ef50f9fd7e
commit
21dff0683d
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue