From 31e186687e443767fe2f2a11c3d31a412ad35ef1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 23 Mar 2012 14:32:46 +0100 Subject: [PATCH] [FIX] Fixed crash when clearing avatar in form view. However, clearing means a new default avatar will be chosen. bzr revid: tde@openerp.com-20120323133246-78z4fszbqcvir16h --- openerp/addons/base/res/res_users.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py index 5c52497219a..65e514fcb31 100644 --- a/openerp/addons/base/res/res_users.py +++ b/openerp/addons/base/res/res_users.py @@ -218,9 +218,13 @@ class users(osv.osv): return dict(zip(ids, ['extended' if user in extended_users else 'simple' for user in ids])) def onchange_avatar(self, cr, uid, ids, value, context=None): - return {'value': {'avatar_big': self._avatar_resize(cr, uid, value, 540, 450, context=context), 'avatar': self._avatar_resize(cr, uid, value, context=context) } } + if not value: + return {'value': {'avatar_big': value, 'avatar': value} } + return {'value': {'avatar_big': self._avatar_resize(cr, uid, value, 540, 450, context=context), 'avatar': self._avatar_resize(cr, uid, value, context=context)} } def _set_avatar(self, cr, uid, id, name, value, args, context=None): + if not value: + return {'value': {'avatar_big': value, 'avatar': value} } return self.write(cr, uid, [id], {'avatar_big': self._avatar_resize(cr, uid, value, 540, 450, context=context)}, context=context) def _avatar_resize(self, cr, uid, avatar, height=180, width=150, context=None):