abdallah
/
server-env
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s_env_ir_config_param: allow empty values 

Sometimes you really want an empty default value.
Make it possible on demand w/ a specific ctx key.
This commit is contained in:
Simone Orsi 2022-10-18 18:56:37 +02:00
parent e88cc50490
commit f033d48162
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server_environment_ir_config_parameter/models/ir_config_parameter.py
View File

@ -29,8 +29,9 @@ class IrConfigParameter(models.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)
if serv_config.has_option(SECTION, key): if serv_config.has_option(SECTION, key):
allow_empty = self.env.context.get("icp_get_param__allow_empty")
cvalue = serv_config.get(SECTION, key) cvalue = serv_config.get(SECTION, key)
if not cvalue: if not cvalue and not allow_empty:
raise UserError( raise UserError(
_("Key %s is empty in " "server_environment_file") % (key,) _("Key %s is empty in " "server_environment_file") % (key,)
) )

4
server_environment_ir_config_parameter/tests/test_server_environment_ircp.py
View File

@ -93,6 +93,10 @@ mail.catchall.alias=my_alias"""
with self.assertRaises(UserError): with self.assertRaises(UserError):
self.ICP.get_param("ircp_empty") self.ICP.get_param("ircp_empty")
self.assertEqual(self.ICP.get_param("ircp_nonexistant"), False) self.assertEqual(self.ICP.get_param("ircp_nonexistant"), False)
# bypass empty: no error
self.ICP.with_context(icp_get_param__allow_empty=True).get_param(
"ircp_empty"
)
def test_override_xmldata(self): def test_override_xmldata(self):
with self.load_config( with self.load_config(