Merge PR #67 into 12.0

Signed-off-by sbidoul
This commit is contained in:
OCA-git-bot 2020-10-16 16:45:38 +00:00
commit 58cd35e4c5
5 changed files with 51 additions and 5 deletions

View File

@ -13,6 +13,7 @@
'server_environment', 'server_environment',
], ],
'data': [ 'data': [
'views/view_ir_config_parameter.xml',
], ],
'demo': [ 'demo': [
], ],

View File

@ -1,7 +1,7 @@
# Copyright 2016-2018 ACSONE SA/NV # Copyright 2016-2018 ACSONE SA/NV
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from odoo import api, models, _ from odoo import api, fields, models, _
from odoo.exceptions import UserError from odoo.exceptions import UserError
from odoo.addons.server_environment import serv_config from odoo.addons.server_environment import serv_config
@ -13,6 +13,19 @@ class IrConfigParameter(models.Model):
_inherit = 'ir.config_parameter' _inherit = 'ir.config_parameter'
is_environment = fields.Boolean(
string="Defined by environment",
compute="_compute_is_environment",
help="If check, the value in the database will be ignored"
" and alternatively, the system will use the key defined"
" in your odoo.cfg environment file.")
@api.multi
def _compute_is_environment(self):
for parameter in self:
parameter.is_environment = serv_config.has_option(
SECTION, parameter.key)
@api.model @api.model
def get_param(self, key, default=False): def get_param(self, key, default=False):
value = super().get_param(key, default=None) value = super().get_param(key, default=None)

View File

@ -1,3 +1,4 @@
* Stéphane Bidoul <stephane.bidoul@acsone.eu> (https://acsone.eu) * Stéphane Bidoul <stephane.bidoul@acsone.eu> (https://acsone.eu)
* Thierry Ducrest <thierry.ducrest@camptocamp.com> * Thierry Ducrest <thierry.ducrest@camptocamp.com>
* Gilles Meyomesse <gilles.meyomesse@acsone.eu> (https://acsone.eu) * Gilles Meyomesse <gilles.meyomesse@acsone.eu> (https://acsone.eu)
* Sylvain LE GAL (https://www.twitter.com/legalsylvain)

View File

@ -1,4 +0,0 @@
When the user modifies System Parameters that are defined in the config
file, the changes are ignored. It would be nice to display which system
parameters come from the config file and possibly make their key and value
readonly in the user interface.

View File

@ -0,0 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (C) 2020 - Today: GRAP (http://www.grap.coop)
@author: Sylvain LE GAL (https://twitter.com/legalsylvain)
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-->
<odoo>
<record id="view_ir_config_parameter_tree" model="ir.ui.view">
<field name="model">ir.config_parameter</field>
<field name="inherit_id" ref="base.view_ir_config_list"/>
<field name="arch" type="xml">
<field name="value" position="after">
<field name="is_environment"/>
</field>
</field>
</record>
<record id="view_ir_config_parameter_form" model="ir.ui.view">
<field name="model">ir.config_parameter</field>
<field name="inherit_id" ref="base.view_ir_config_form"/>
<field name="arch" type="xml">
<field name="value" position="after">
<field name="is_environment"/>
</field>
<field name="key" position="attributes">
<attribute name="attrs">{'readonly': [('is_environment', '=', True)]}</attribute>
</field>
<field name="value" position="attributes">
<attribute name="attrs">{'readonly': [('is_environment', '=', True)]}</attribute>
</field>
</field>
</record>
</odoo>