diff --git a/data_encryption/models/encrypted_data.py b/data_encryption/models/encrypted_data.py index f49b9b7..d9dbc67 100644 --- a/data_encryption/models/encrypted_data.py +++ b/data_encryption/models/encrypted_data.py @@ -24,7 +24,9 @@ class EncryptedData(models.Model): name = fields.Char(required=True, readonly=True, index=True, help="Technical name") environment = fields.Char( - required=True, index=True, help="Concerned Odoo environment (prod, preprod...)", + required=True, + index=True, + help="Concerned Odoo environment (prod, preprod...)", ) encrypted_data = fields.Binary(attachment=False) @@ -83,7 +85,7 @@ class EncryptedData(models.Model): @staticmethod def _retrieve_env(): """Return the current environment - Raise if none is found + Raise if none is found """ current = config.get("running_env", False) if not current: diff --git a/server_environment_data_encryption/models/server_env_mixin.py b/server_environment_data_encryption/models/server_env_mixin.py index 5a3c5b9..c008577 100644 --- a/server_environment_data_encryption/models/server_env_mixin.py +++ b/server_environment_data_encryption/models/server_env_mixin.py @@ -32,8 +32,8 @@ class ServerEnvMixin(models.AbstractModel): def _inverse_server_env(self, field_name): """ - When this module is installed, we store values into encrypted data - env instead of a default field in database (not env dependent). + When this module is installed, we store values into encrypted data + env instead of a default field in database (not env dependent). """ is_editable_field = self._server_env_is_editable_fieldname(field_name) encrypted_data_obj = self.env["encrypted.data"].sudo() @@ -150,7 +150,10 @@ class ServerEnvMixin(models.AbstractModel): self, view_id=None, view_type="form", toolbar=False, submenu=False ): res = super().fields_view_get( - view_id=view_id, view_type=view_type, toolbar=toolbar, submenu=submenu, + view_id=view_id, + view_type=view_type, + toolbar=toolbar, + submenu=submenu, ) res["arch"] = self._update_form_view_from_env(res["arch"], view_type) return res diff --git a/server_environment_data_encryption/tests/fixtures/base.xml b/server_environment_data_encryption/tests/fixtures/base.xml index 524c959..11f2eb7 100644 --- a/server_environment_data_encryption/tests/fixtures/base.xml +++ b/server_environment_data_encryption/tests/fixtures/base.xml @@ -1,15 +1,22 @@
diff --git a/server_environment_data_encryption/tests/fixtures/res1.xml b/server_environment_data_encryption/tests/fixtures/res1.xml index 7ca515a..60966da 100644 --- a/server_environment_data_encryption/tests/fixtures/res1.xml +++ b/server_environment_data_encryption/tests/fixtures/res1.xml @@ -1,21 +1,43 @@ diff --git a/server_environment_data_encryption/tests/fixtures/res2.xml b/server_environment_data_encryption/tests/fixtures/res2.xml index 032e108..d788320 100644 --- a/server_environment_data_encryption/tests/fixtures/res2.xml +++ b/server_environment_data_encryption/tests/fixtures/res2.xml @@ -1,21 +1,44 @@ diff --git a/setup/data_encryption/odoo/addons/data_encryption b/setup/data_encryption/odoo/addons/data_encryption new file mode 120000 index 0000000..2aee058 --- /dev/null +++ b/setup/data_encryption/odoo/addons/data_encryption @@ -0,0 +1 @@ +../../../../data_encryption \ No newline at end of file diff --git a/setup/data_encryption/setup.py b/setup/data_encryption/setup.py new file mode 100644 index 0000000..28c57bb --- /dev/null +++ b/setup/data_encryption/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) diff --git a/setup/server_environment_data_encryption/odoo/addons/server_environment_data_encryption b/setup/server_environment_data_encryption/odoo/addons/server_environment_data_encryption new file mode 120000 index 0000000..8052eed --- /dev/null +++ b/setup/server_environment_data_encryption/odoo/addons/server_environment_data_encryption @@ -0,0 +1 @@ +../../../../server_environment_data_encryption \ No newline at end of file diff --git a/setup/server_environment_data_encryption/setup.py b/setup/server_environment_data_encryption/setup.py new file mode 100644 index 0000000..28c57bb --- /dev/null +++ b/setup/server_environment_data_encryption/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)