From 4937b6bdd6624a9f2c2ebb5384b4559adf2ff462 Mon Sep 17 00:00:00 2001 From: "tfr@openerp.com" <> Date: Tue, 12 Jul 2011 16:07:03 +0200 Subject: [PATCH 1/3] [IMP] get_hostname tools function based on ir.config_parameter on the key network.hostname bzr revid: tfr@openerp.com-20110712140703-gvfnjs1y3r51kagn --- openerp/tools/misc.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/openerp/tools/misc.py b/openerp/tools/misc.py index dc66142fc4a..0e14211ce60 100644 --- a/openerp/tools/misc.py +++ b/openerp/tools/misc.py @@ -248,6 +248,15 @@ def flatten(list): r.append(e) return r +def get_hostname(obj, cr, uid): + parameter_pool = obj.pool.get('ir.config_parameter') + ids = parameter_pool.search(cr, uid, [('key', '=', 'network.hostname')]) + if ids: + return parameter_pool.browse(cr, uid, ids)[0].value + else: + return 'localhost' + + def reverse_enumerate(l): """Like enumerate but in the other sens From f6acf3129535d5441c391fdaed83b2a897d83efe Mon Sep 17 00:00:00 2001 From: "tfr@openerp.com" <> Date: Tue, 12 Jul 2011 17:20:27 +0200 Subject: [PATCH 2/3] [IMP] get hostname using get_param + add default value in get_param bzr revid: tfr@openerp.com-20110712152027-oj6b42o0bttijkst --- openerp/addons/base/ir/ir_config_parameter.py | 4 ++-- openerp/tools/misc.py | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) 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 From 822b3936697ac9f30ca00d8d6bd7511ce30333b5 Mon Sep 17 00:00:00 2001 From: "tfr@openerp.com" <> Date: Tue, 12 Jul 2011 17:37:30 +0200 Subject: [PATCH 3/3] [RM] remove get hostname bzr revid: tfr@openerp.com-20110712153730-u29ss55hee7qs1et --- openerp/tools/misc.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/openerp/tools/misc.py b/openerp/tools/misc.py index fd72728d3e8..dc66142fc4a 100644 --- a/openerp/tools/misc.py +++ b/openerp/tools/misc.py @@ -248,10 +248,6 @@ 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