From 3122d6d3f4bd83b90943e98646b57da812b248d3 Mon Sep 17 00:00:00 2001
From: sbejaoui <souheil.bejaoui@acsone.eu>
Date: Wed, 14 Oct 2020 17:47:47 +0200
Subject: [PATCH] [14.0][MIG] - migration server_environment

---
 server_environment/__manifest__.py                 |  8 ++++++--
 .../models/server_env_tech_name_mixin.py           |  6 +++++-
 server_environment/security/server_config.xml      | 14 ++++++++++++++
 server_environment/serv_config.xml                 | 11 +++++------
 server_environment/server_env.py                   |  8 ++++----
 server_environment/tests/common.py                 |  4 ++--
 .../tests/test_environment_variable.py             |  3 +--
 .../odoo/addons/server_environment                 |  1 +
 setup/server_environment/setup.py                  |  6 ++++++
 9 files changed, 44 insertions(+), 17 deletions(-)
 create mode 100644 server_environment/security/server_config.xml
 create mode 120000 setup/server_environment/odoo/addons/server_environment
 create mode 100644 setup/server_environment/setup.py

diff --git a/server_environment/__manifest__.py b/server_environment/__manifest__.py
index 7699d18..ae1020e 100644
--- a/server_environment/__manifest__.py
+++ b/server_environment/__manifest__.py
@@ -4,13 +4,17 @@
 
 {
     "name": "server configuration environment files",
-    "version": "13.0.2.3.1",
+    "version": "14.0.1.0.0",
     "depends": ["base", "base_sparse_field"],
     "author": "Camptocamp,Odoo Community Association (OCA)",
     "summary": "move some configurations out of the database",
     "website": "http://github.com/OCA/server-env",
     "license": "GPL-3 or any later version",
     "category": "Tools",
-    "data": ["security/res_groups.xml", "serv_config.xml"],
+    "data": [
+        "security/server_config.xml",
+        "security/res_groups.xml",
+        "serv_config.xml",
+    ],
     "installable": True,
 }
diff --git a/server_environment/models/server_env_tech_name_mixin.py b/server_environment/models/server_env_tech_name_mixin.py
index fcf676c..02736c7 100644
--- a/server_environment/models/server_env_tech_name_mixin.py
+++ b/server_environment/models/server_env_tech_name_mixin.py
@@ -29,7 +29,11 @@ class ServerEnvTechNameMixin(models.AbstractModel):
     _name = "server.env.techname.mixin"
     _description = "Server environment technical name"
     _sql_constraints = [
-        ("tech_name_uniq", "unique(tech_name)", "`tech_name` must be unique!",)
+        (
+            "tech_name_uniq",
+            "unique(tech_name)",
+            "`tech_name` must be unique!",
+        )
     ]
     # TODO: could leverage the new option for computable / writable fields
     # and get rid of some onchange / read / write code.
diff --git a/server_environment/security/server_config.xml b/server_environment/security/server_config.xml
new file mode 100644
index 0000000..2273e9e
--- /dev/null
+++ b/server_environment/security/server_config.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright 2020 ACSONE SA/NV
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
+<odoo>
+    <record model="ir.model.access" id="server_config_access">
+        <field name="name">server.config access</field>
+        <field name="model_id" ref="model_server_config" />
+        <field name="group_id" ref="base.group_user" />
+        <field name="perm_read" eval="1" />
+        <field name="perm_create" eval="1" />
+        <field name="perm_write" eval="1" />
+        <field name="perm_unlink" eval="1" />
+    </record>
+</odoo>
diff --git a/server_environment/serv_config.xml b/server_environment/serv_config.xml
index 29fab6d..5d23dd8 100644
--- a/server_environment/serv_config.xml
+++ b/server_environment/serv_config.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" ?>
 <odoo>
-    <act_window
-        id="act_show_config_window"
-        name="Server Environment"
-        res_model="server.config"
-        view_mode="form"
-    />
+    <record model="ir.actions.act_window" id="act_show_config_window">
+        <field name="name">Server Environment</field>
+        <field name="res_model">server.config</field>
+        <field name="view_mode">form</field>
+    </record>
     <menuitem
         parent="base.menu_ir_property"
         sequence="90"
diff --git a/server_environment/server_env.py b/server_environment/server_env.py
index 3106f25..1acd0bc 100644
--- a/server_environment/server_env.py
+++ b/server_environment/server_env.py
@@ -149,7 +149,7 @@ def _load_config_from_env(config_p):
 
 def _load_config():
     """Load the configuration and return a ConfigParser instance."""
-    config_p = configparser.SafeConfigParser()
+    config_p = configparser.ConfigParser()
     # options are case-sensitive
     config_p.optionxform = str
 
@@ -306,10 +306,10 @@ class ServerConfiguration(models.TransientModel):
     ):
         """Overwrite the default method to render the custom view."""
         res = super().fields_view_get(view_id, view_type, toolbar)
-        View = self.env["ir.ui.view"]
-        if view_type == "form":
+        view = self.env["ir.ui.view"].browse(view_id)
+        if view and view_type == "form":
             arch_node = self._arch
-            xarch, xfields = View.postprocess_and_fields(self._name, arch_node, view_id)
+            xarch, xfields = view.postprocess_and_fields(arch_node, model=self._name)
             res["arch"] = xarch
             res["fields"] = xfields
         return res
diff --git a/server_environment/tests/common.py b/server_environment/tests/common.py
index 519706f..af99e7f 100644
--- a/server_environment/tests/common.py
+++ b/server_environment/tests/common.py
@@ -7,8 +7,8 @@ from unittest.mock import patch
 
 from odoo.tests import common
 
-import odoo.addons.server_environment.models.server_env_mixin as server_env_mixin
-from odoo.addons.server_environment import server_env
+from .. import server_env
+from ..models import server_env_mixin as server_env_mixin
 
 
 class ServerEnvironmentCase(common.SavepointCase):
diff --git a/server_environment/tests/test_environment_variable.py b/server_environment/tests/test_environment_variable.py
index 5c21677..4151531 100644
--- a/server_environment/tests/test_environment_variable.py
+++ b/server_environment/tests/test_environment_variable.py
@@ -6,8 +6,7 @@ from unittest.mock import patch
 
 from odoo.tools.config import config as odoo_config
 
-from odoo.addons.server_environment import server_env
-
+from .. import server_env
 from .common import ServerEnvironmentCase
 
 
diff --git a/setup/server_environment/odoo/addons/server_environment b/setup/server_environment/odoo/addons/server_environment
new file mode 120000
index 0000000..13248f5
--- /dev/null
+++ b/setup/server_environment/odoo/addons/server_environment
@@ -0,0 +1 @@
+../../../../server_environment
\ No newline at end of file
diff --git a/setup/server_environment/setup.py b/setup/server_environment/setup.py
new file mode 100644
index 0000000..28c57bb
--- /dev/null
+++ b/setup/server_environment/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)