From 9d2ee61466e552261bff94997f9e92e6d30e70f2 Mon Sep 17 00:00:00 2001
From: Akim Juillerat <akim.juillerat@camptocamp.com>
Date: Mon, 2 Jun 2025 19:38:20 +0200
Subject: [PATCH] Fix inheritance of server env techname mixin

In case a model was inheriting both server.env.mixin and server.env.techname.mixin
the value of _server_env_section_name_field was depending on the order
in which the mixins were inherited on that model.

If server.env.mixin was inherit first as in:
_name = "my.model"
_inherit = ["my.model", "server.env.mixin", "server.env.techname.mixin"]

Then the value of _server_env_section_name would be `name`

If server.env.techname.mixin was inherit first as in:
_name = "my.model"
_inherit = ["my.model", "server.env.techname.mixin", "server.env.mixin"]

Then the value of _server_env_section_name would be `tech_name`

To avoid this, since the server.env.techname.mixin changes an attribute of server.env.mixin,
server.env.techname.mixin must inherit the server.env.mixin.

With this, only one of the mixins needs to be inherited and there cannot
be any 'silent' issue, where the _server_env_section_name depends on the
order on which mixins are inherited.
---
 server_environment/models/server_env_tech_name_mixin.py | 5 +++--
 server_environment/readme/CONFIGURE.rst                 | 3 ++-
 server_environment/readme/USAGE.rst                     | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/server_environment/models/server_env_tech_name_mixin.py b/server_environment/models/server_env_tech_name_mixin.py
index d0b6bbbd9..8a536ce74 100644
--- a/server_environment/models/server_env_tech_name_mixin.py
+++ b/server_environment/models/server_env_tech_name_mixin.py
@@ -16,17 +16,18 @@ class ServerEnvTechNameMixin(models.AbstractModel):
     This mixin helps solve the problem by providing a tech name field
     and a cleanup machinery as well as a unique constrain.
 
-    To use this mixin add it to the _inherit attr of your module like:
+    To use this mixin add it to the _inherit attr of your model like:
+    (instead of `server.env.mixin`)
 
         _inherit = [
             "my.model",
             "server.env.techname.mixin",
-            "server.env.mixin",
         ]
 
     """
 
     _name = "server.env.techname.mixin"
+    _inherit = "server.env.mixin"
     _description = "Server environment technical name"
     _sql_constraints = [
         (
diff --git a/server_environment/readme/CONFIGURE.rst b/server_environment/readme/CONFIGURE.rst
index b3e8024ce..498a395cd 100644
--- a/server_environment/readme/CONFIGURE.rst
+++ b/server_environment/readme/CONFIGURE.rst
@@ -96,4 +96,5 @@ Server environment integration
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Read the documentation of the class `models/server_env_mixin.py
-<models/server_env_mixin.py>`_.
+<models/server_env_mixin.py>`_ and `models/server_env_tech_name_mixin.py
+<models/server_env_tech_name_mixin.py>`_
diff --git a/server_environment/readme/USAGE.rst b/server_environment/readme/USAGE.rst
index d12b21daa..deeea866a 100644
--- a/server_environment/readme/USAGE.rst
+++ b/server_environment/readme/USAGE.rst
@@ -19,6 +19,6 @@ If you want to have a technical name to reference::
 
     class StorageBackend(models.Model):
         _name = "storage.backend"
-        _inherit = ["storage.backend", "server.env.techname.mixin", "server.env.mixin"]
+        _inherit = ["storage.backend", "server.env.techname.mixin"]
 
         [...]