[MERGE] Merged with branch holding user image

bzr revid: tde@openerp.com-20120327073412-ok0di6zv12w7wgyy

addons/crm/crm_lead_view.xml

@@ -305,7 +305,7 @@
                                         </t>
                                     </td>
                                     <td valign="top" width="22">
-                                        <img t-att-src="kanban_image('res.users', 'avatar_mini', record.user_id.raw_value[0])"  t-att-title="record.user_id.value"
+                                        <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])"  t-att-title="record.user_id.value"
                                         width="22" height="22" class="oe_kanban_gravatar"/>
                                     </td>
                                 </tr>

addons/hr/doc/hr_employee_img.rst

@@ -2,7 +2,8 @@ HR photo specs
 ==============
 
 This revision modifies the photo for HR employees. Two fields now exist in the hr.employee model:
- - photo, a binary field holding the image
- - photo_mini, a binary field holding an automatically resized version of the avatar. Dimensions of the resized avatar are 180x150.
+ - photo_big, a binary field holding the image. It is base-64 encoded, and PIL-supported. It is automatically resized as an 540x450 px image.
+ - photo, a functional binary field holding an automatically resized version of the photo. Dimensions of the resized photo are 180x150. This field is used as an inteface to get and set the employee photo.
+When changing the photo through the photo function field, the new image is automatically resized to 540x450, and stored in the photo_big field. This triggers the function field, that will compute a 180x150 resized version of the image.
 
-Employee photo should be used only when dealing with employees, using the photo_mini field. When dealing with users, use the res.users avatar_mini field instead.
+Employee photo should be used only when dealing with employees, using the photo field. When dealing with users, use the res.users avatar field instead.

addons/hr/hr.py

@@ -149,27 +149,31 @@ class hr_employee(osv.osv):
     _description = "Employee"
     _inherits = {'resource.resource': "resource_id"}
 
-    def onchange_photo_mini(self, cr, uid, ids, value, context=None):
-        return {'value': {'photo': value, 'photo_mini': self._photo_resize(cr, uid, value) } }
+    def onchange_photo(self, cr, uid, ids, value, context=None):
+        if not value:
+            return {'value': {'photo_big': value, 'photo': value} }
+        return {'value': {'photo_big': self._photo_resize(cr, uid, value, 540, 450, context=context), 'photo': self._photo_resize(cr, uid, value, context=context)} }
     
-    def _set_photo_mini(self, cr, uid, id, name, value, args, context=None):
-        return self.write(cr, uid, [id], {'photo': value}, context=context)
+    def _set_photo(self, cr, uid, id, name, value, args, context=None):
+        if not value:
+            vals = {'photo_big': value}
+        else:
+            vals = {'photo_big': self._photo_resize(cr, uid, value, 540, 450, context=context)}
+        return self.write(cr, uid, [id], vals, context=context)
     
-    def _photo_resize(self, cr, uid, photo, context=None):
+    def _photo_resize(self, cr, uid, photo, heigth=180, width=150, context=None):
         image_stream = io.BytesIO(photo.decode('base64'))
         img = Image.open(image_stream)
-        img.thumbnail((180, 150), Image.ANTIALIAS)
+        img.thumbnail((heigth, width), Image.ANTIALIAS)
         img_stream = StringIO.StringIO()
         img.save(img_stream, "JPEG")
         return img_stream.getvalue().encode('base64')
     
-    def _get_photo_mini(self, cr, uid, ids, name, args, context=None):
-        result = {}
+    def _get_photo(self, cr, uid, ids, name, args, context=None):
+        result = dict.fromkeys(ids, False)
         for hr_empl in self.browse(cr, uid, ids, context=context):
-            if not hr_empl.photo:
-                result[hr_empl.id] = False
-            else:
-                result[hr_empl.id] = self._photo_resize(cr, uid, hr_empl.photo, context=context)
+            if hr_empl.photo_big:
+                result[hr_empl.id] = self._photo_resize(cr, uid, hr_empl.photo_big, context=context)
         return result
     
     _columns = {
@@ -197,11 +201,11 @@ class hr_employee(osv.osv):
         'resource_id': fields.many2one('resource.resource', 'Resource', ondelete='cascade', required=True),
         'coach_id': fields.many2one('hr.employee', 'Coach'),
         'job_id': fields.many2one('hr.job', 'Job'),
-        'photo': fields.binary('Photo'),
-        'photo_mini': fields.function(_get_photo_mini, fnct_inv=_set_photo_mini, string='Photo Mini', type="binary",
+        'photo_big': fields.binary('Big-sized employee photo', help="This field holds the photo of the employee. The photo field is used as an interface to access this field. The image is base64 encoded, and PIL-supported. Full-sized photo are however resized to 540x450 px."),
+        'photo': fields.function(_get_photo, fnct_inv=_set_photo, string='Employee photo', type="binary",
             store = {
-                'hr.employee': (lambda self, cr, uid, ids, c={}: ids, ['photo'], 10),
-            }),
+                'hr.employee': (lambda self, cr, uid, ids, c={}: ids, ['photo_big'], 10),
+            }, help="Image used as photo for the employee. It is automatically resized as a 180x150 px image. A larger photo is stored inside the photo_big field."),
         'passport_id':fields.char('Passport No', size=64),
         'color': fields.integer('Color Index'),
         'city': fields.related('address_id', 'city', type='char', string='City'),
@@ -248,11 +252,11 @@ class hr_employee(osv.osv):
 
     def _get_photo(self, cr, uid, context=None):
         photo_path = addons.get_module_resource('hr','images','photo.png')
-        return self._photo_resize(cr, uid, open(photo_path, 'rb').read().encode('base64'))
+        return self._photo_resize(cr, uid, open(photo_path, 'rb').read().encode('base64'), context=context)
 
     _defaults = {
         'active': 1,
-        'photo_mini': _get_photo,
+        'photo': _get_photo,
         'marital': 'single',
         'color': 0,
     }

addons/hr/hr_view.xml

@@ -34,7 +34,7 @@
                         <field name="parent_id" />
                         </group>
                         <group colspan="2" col="1">
-                          <field name="photo_mini" widget='image' nolabel="1" on_change="onchange_photo_mini(photo_mini)"/>
+                          <field name="photo" widget='image' nolabel="1" on_change="onchange_photo(photo)"/>
                         </group>
                     </group>
                     <notebook colspan="6">

addons/project/project_view.xml

@@ -354,7 +354,7 @@
                                             <field name="name"/>
                                         </td>
                                         <td valign="top" width="22">
-                                            <img t-att-src="kanban_image('res.users', 'avatar_mini', record.user_id.raw_value[0])"  t-att-title="record.user_id.value"
+                                            <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])"  t-att-title="record.user_id.value"
                                             width="22" height="22" class="oe_kanban_gravatar"/>
                                         </td>
                                     </tr>