diff --git a/openerp/addons/base/ir/ir_config_parameter.py b/openerp/addons/base/ir/ir_config_parameter.py index b1688b9a669..f8c0348e8f6 100644 --- a/openerp/addons/base/ir/ir_config_parameter.py +++ b/openerp/addons/base/ir/ir_config_parameter.py @@ -62,7 +62,7 @@ class ir_config_parameter(osv.osv): if not ids: self.set_param(cr, 1, key, func()) - def get_param(self, cr, uid, key, context=None): + def get_param(self, cr, uid, key, default=False, context=None): """ Get the value of a parameter. @param key: The key of the parameter. @@ -72,7 +72,7 @@ class ir_config_parameter(osv.osv): """ ids = self.search(cr, uid, [('key','=',key)], context=context) if not ids: - return False + return default param = self.browse(cr, uid, ids[0], context=context) value = param.value return value diff --git a/openerp/tools/misc.py b/openerp/tools/misc.py index dc66142fc4a..fd72728d3e8 100644 --- a/openerp/tools/misc.py +++ b/openerp/tools/misc.py @@ -248,6 +248,10 @@ def flatten(list): r.append(e) return r +def get_hostname(obj, cr, uid): + return obj.pool.get('ir.config_parameter').get_param(cr, uid, 'network.hostname', default="localhost") + + def reverse_enumerate(l): """Like enumerate but in the other sens