From 545f5421c3f80d6dd5816006ce2155d599e23cae Mon Sep 17 00:00:00 2001 From: "P. Christeas" Date: Tue, 28 Dec 2010 15:28:13 +0200 Subject: base_setup: adapt to base_crypt mangling the passwords When base_crypt is installed, base_setup should not list the hashed passwords. bzr revid: p_christ@hol.gr-20101228132813-ur2ezdevecdjwr75 --- addons/base_setup/__init__.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'addons/base_setup/__init__.py') diff --git a/addons/base_setup/__init__.py b/addons/base_setup/__init__.py index 85d01779842..9ed5ec84535 100644 --- a/addons/base_setup/__init__.py +++ b/addons/base_setup/__init__.py @@ -45,9 +45,15 @@ class base_setup_config_choice(osv.osv_memory): def get_users(self, cr, uid, context=None): user_obj = self.pool.get('res.users') user_ids = user_obj.search(cr, uid, []) - users = user_obj.browse(cr, uid, user_ids, context=context) - user_str = '\n'.join(map(lambda x: ' - %s :\n\t\tLogin : %s \n\t\tPassword : %s' % (x.name, x.login, x.password), users)) - return _('The following users have been installed : \n')+ user_str + user_list = [] + user_tmpl_nopass = _(' - %s :\n\t\tLogin : %s') + user_tmpl_pass = _(' - %s :\n\t\tLogin : %s \n\t\tPassword : %s') + for user in user_obj.browse(cr, uid, user_ids, context=context): + if user.password and not user.password.startswith('$'): + user_list.append(user_tmpl_pass % (user.name, user.login, user.password)) + else: + user_list.append(user_tmpl_nopass % (user.name, user.login)) + return _('The following users have been installed : \n')+ '\n'.join(user_list) _columns = { 'installed_users':fields.text('Installed Users', readonly=True), -- cgit v1.2.3