From 9f2a5f2d039ace4c02f018888b35fdb6ead0e030 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 13 Mar 2012 11:29:16 +0100
Subject: [PATCH] [IMP] Improved default avatar (now takes randomly between 6
 avatars); cleaned code about avatar and avatar_mini management; fixed bug
 when creating a new user where the chosen avatar was not saved

bzr revid: tde@openerp.com-20120313102916-w5rdtwco72xe8m7n
---
 openerp/addons/base/base_update.xml  |   2 +-
 openerp/addons/base/images/photo.png | Bin 2685 -> 0 bytes
 openerp/addons/base/res/res_users.py |  34 +++++++++++++++++----------
 3 files changed, 23 insertions(+), 13 deletions(-)
 delete mode 100644 openerp/addons/base/images/photo.png

diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml
index 0eef0a0f4cb..5d6f214c0a9 100644
--- a/openerp/addons/base/base_update.xml
+++ b/openerp/addons/base/base_update.xml
@@ -130,7 +130,7 @@
                                 <group colspan="7" col="7">
                                     <group col="2" colspan="1">
                                         <separator string="Avatar" colspan="2"/>
-                                        <field name="avatar_mini" widget='image' nolabel="1" colspan="2"/>
+                                        <field name="avatar_mini" widget='image' nolabel="1" colspan="2" on_change="onchange_avatar_mini(avatar_mini)"/>
                                     </group>
                                     <group col="3" colspan="2">
                                         <separator string="Preferences" colspan="3"/>
diff --git a/openerp/addons/base/images/photo.png b/openerp/addons/base/images/photo.png
deleted file mode 100644
index 1d124127b2bf7115fdb38ab2fc136fdf5b531237..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2685
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

diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 25d7ce9d9f9..f5fba485b02 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -35,8 +35,11 @@ from tools.translate import _
 import openerp
 import openerp.exceptions
 
+# for avatar resizing
 import io, StringIO
 from PIL import Image
+# for default avatar choice
+import random
 
 _logger = logging.getLogger(__name__)
 
@@ -214,22 +217,27 @@ class users(osv.osv):
         extended_users = group_obj.read(cr, uid, extended_group_id, ['users'], context=context)['users']
         return dict(zip(ids, ['extended' if user in extended_users else 'simple' for user in ids]))
 
+    def onchange_avatar_mini(self, cr, uid, ids, value, context=None):
+        return {'value': {'avatar': value } }
+    
     def _set_avatar_mini(self, cr, uid, id, name, value, args, context=None):
         return self.write(cr, uid, [id], {'avatar': value}, context=context)
     
+    def _avatar_resize(self, cr, uid, avatar, context=None):
+        image_stream = io.BytesIO(avatar.decode('base64'))
+        img = Image.open(image_stream)
+        img.thumbnail((180, 150), Image.ANTIALIAS)
+        img_stream = StringIO.StringIO()
+        img.save(img_stream, "JPEG")
+        return img_stream.getvalue().encode('base64')
+    
     def _get_avatar_mini(self, cr, uid, ids, name, args, context=None):
         result = {}
         for user in self.browse(cr, uid, ids, context=context):
             if not user.avatar:
                 result[user.id] = False
-                continue
-
-            image_stream = io.BytesIO(user.avatar.decode('base64'))
-            img = Image.open(image_stream)
-            img.thumbnail((180, 150), Image.ANTIALIAS)
-            img_stream = StringIO.StringIO()
-            img.save(img_stream, "JPEG")
-            result[user.id] = img_stream.getvalue().encode('base64')
+            else:
+                result[user.id] = self._avatar_resize(cr, uid, user.avatar)
         return result
 
     def _set_new_password(self, cr, uid, id, name, value, args, context=None):
@@ -378,13 +386,15 @@ class users(osv.osv):
         return result
 
     def _get_avatar(self, cr, uid, context=None):
-        avatar_path = openerp.modules.get_module_resource('base','images','photo.png')
-        return open(avatar_path, 'rb').read().encode('base64')
-
+        # default avatar file name: avatar0 -> avatar6, choose randomly
+        random.seed()
+        avatar_path = openerp.modules.get_module_resource('base', 'images', 'avatar%d.jpg' % random.randint(0, 6))
+        return self._avatar_resize(cr, uid, open(avatar_path, 'rb').read().encode('base64'))
+    
     _defaults = {
         'password' : '',
         'context_lang': 'en_US',
-        'avatar': _get_avatar,
+        'avatar_mini': _get_avatar,
         'active' : True,
         'menu_id': _get_menu,
         'company_id': _get_company,