Skip to content

Commit ffa31a1

Browse files
committed
Merge PR #232 into 16.0
Signed-off-by simahawk
2 parents 85ee9f6 + 9d2ee61 commit ffa31a1

3 files changed

Lines changed: 6 additions & 4 deletions

File tree

server_environment/models/server_env_tech_name_mixin.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,18 @@ class ServerEnvTechNameMixin(models.AbstractModel):
1616
This mixin helps solve the problem by providing a tech name field
1717
and a cleanup machinery as well as a unique constrain.
1818
19-
To use this mixin add it to the _inherit attr of your module like:
19+
To use this mixin add it to the _inherit attr of your model like:
20+
(instead of `server.env.mixin`)
2021
2122
_inherit = [
2223
"my.model",
2324
"server.env.techname.mixin",
24-
"server.env.mixin",
2525
]
2626
2727
"""
2828

2929
_name = "server.env.techname.mixin"
30+
_inherit = "server.env.mixin"
3031
_description = "Server environment technical name"
3132
_sql_constraints = [
3233
(

server_environment/readme/CONFIGURE.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,4 +102,5 @@ Server environment integration
102102
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
103103

104104
Read the documentation of the class `models/server_env_mixin.py
105-
<models/server_env_mixin.py>`_.
105+
<models/server_env_mixin.py>`_ and `models/server_env_tech_name_mixin.py
106+
<models/server_env_tech_name_mixin.py>`_

server_environment/readme/USAGE.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ If you want to have a technical name to reference::
1919

2020
class StorageBackend(models.Model):
2121
_name = "storage.backend"
22-
_inherit = ["storage.backend", "server.env.techname.mixin", "server.env.mixin"]
22+
_inherit = ["storage.backend", "server.env.techname.mixin"]
2323

2424
[...]

0 commit comments

Comments
 (0)