Skip to content

Commit

Permalink
[MIG] server_environment: Migration to 16.0
Browse files Browse the repository at this point in the history
  • Loading branch information
FrancoMaxime committed Oct 4, 2022
1 parent 961cf7e commit 2b05b46
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 22 deletions.
9 changes: 5 additions & 4 deletions server_environment/models/server_env_tech_name_mixin.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,11 @@ def _onchange_tech_name(self):
# make sure is normalized
self.tech_name = self._normalize_tech_name(self.tech_name)

@api.model
def create(self, vals):
self._handle_tech_name(vals)
return super().create(vals)
@api.model_create_multi
def create(self, vals_list):
for vals in vals_list:
self._handle_tech_name(vals)
return super().create(vals_list)

def write(self, vals):
self._handle_tech_name(vals)
Expand Down
5 changes: 4 additions & 1 deletion server_environment/security/res_groups.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
<odoo>
<record model="res.groups" id="has_server_configuration_access">
<field name="name">View Server Environment Configuration</field>
<field name="users" eval="[(4, ref('base.user_root'))]" />
<field
name="users"
eval="[(4, ref('base.user_root')), (4, ref('base.user_admin'))]"
/>
</record>
</odoo>
30 changes: 15 additions & 15 deletions server_environment/server_env.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
_dir = os.path.dirname(server_environment_files.__file__)
except ImportError:
_logger.info(
"not using server_environment_files for configuration," " no directory found"
"not using server_environment_files for configuration, no directory found"
)
_dir = None

Expand Down Expand Up @@ -202,15 +202,18 @@ def _add_columns(cls):
)
for col, value in cols:
col_name = col.replace(".", "_")
tmp_field = fields.Char(
string=cls._format_key_display_name(col_name),
sparse="config",
readonly=True,
)
setattr(
ServerConfiguration,
col_name,
fields.Char(
string=cls._format_key_display_name(col_name),
sparse="config",
readonly=True,
),
tmp_field,
)
tmp_field.name = col_name
ServerConfiguration._field_definitions.append(tmp_field)
cls._conf_defaults[col_name] = value

@classmethod
Expand Down Expand Up @@ -287,17 +290,14 @@ def _build_osv(cls):
cls._arch = etree.fromstring(arch)

@api.model
def fields_view_get(
self, view_id=None, view_type="form", toolbar=False, submenu=False
):
"""Overwrite the default method to render the custom view."""
res = super().fields_view_get(view_id, view_type, toolbar)
def get_view(self, view_id=None, view_type="form", **options):
res = super().get_view(view_id, view_type, **options)
View = self.env["ir.ui.view"].browse(view_id)
if view_type == "form":
arch_node = self._arch
xarch, xfields = View.postprocess_and_fields(arch_node, model=self._name)
res["arch"] = xarch
res["fields"] = xfields
arch, models = View.postprocess_and_fields(
self._arch, model=self._name, **options
)
res["arch"] = arch
return res

@api.model
Expand Down
4 changes: 2 additions & 2 deletions server_environment/tests/test_server_environment.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
class TestEnv(common.ServerEnvironmentCase):
def test_view(self):
model = self.env["server.config"]
view = model.fields_view_get()
view = model.get_view()
self.assertTrue(view)

def _test_default(self, hidden_pwd=False):
model = self.env["server.config"]
rec = model.create({})
fields = model.fields_view_get()["fields"]
fields = model.fields_get()
self.assertTrue(fields)
defaults = rec.default_get(list(fields))
self.assertTrue(defaults)
Expand Down
1 change: 1 addition & 0 deletions setup/server_environment/odoo/addons/server_environment
6 changes: 6 additions & 0 deletions setup/server_environment/setup.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import setuptools

setuptools.setup(
setup_requires=['setuptools-odoo'],
odoo_addon=True,
)

0 comments on commit 2b05b46

Please sign in to comment.