[IMP] hr_employee: cleaned code. Kanban view now uses photo_mini instead of photo.

bzr revid: tde@openerp.com-20120313111612-qij93zfg6uolcnvd

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 07b0499..7c54810 100644 (file)
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -149,25 +149,29 @@ class hr_employee(osv.osv):
     _description = "Employee"
     _inherits = {'resource.resource': "resource_id"}
 
+    def onchange_photo_mini(self, cr, uid, ids, value, context=None):
+        print 'cacacaporinfeorinf'
+        return {'value': {'photo': value, 'photo_mini': self._photo_resize(cr, uid, value) } }
+    
+    def _set_photo_mini(self, cr, uid, id, name, value, args, context=None):
+        return self.write(cr, uid, [id], {'photo': value}, context=context)
+    
+    def _photo_resize(self, cr, uid, photo, context=None):
+        image_stream = io.BytesIO(photo.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_photo_mini(self, cr, uid, ids, name, args, context=None):
         result = {}
-        for obj in self.browse(cr, uid, ids, context=context):
-            print obj
-            if not obj.photo:
-                result[obj.id] = False
-                continue
-
-            image_stream = io.BytesIO(obj.photo.decode('base64'))
-            img = Image.open(image_stream)
-            img.thumbnail((180, 150), Image.ANTIALIAS)
-            img_stream = StringIO.StringIO()
-            img.save(img_stream, "JPEG")
-            result[obj.id] = img_stream.getvalue().encode('base64')
+        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)
         return result
-
-    def _set_photo_mini(self, cr, uid, id, name, value, args, context=None):
-        self.write(cr, uid, [id], {'photo': value}, context=context)
-        return True
     
     _columns = {
         'country_id': fields.many2one('res.country', 'Nationality'),
@@ -245,11 +249,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 open(photo_path, 'rb').read().encode('base64')
+        return self._photo_resize(cr, uid, open(photo_path, 'rb').read().encode('base64'))
 
     _defaults = {
         'active': 1,
-        'photo': _get_photo,
+        'photo_mini': _get_photo,
         'marital': 'single',
         'color': 0,
     }

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 81f1c65..c2961f2 100644 (file)
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -33,7 +33,7 @@
                         <field name="parent_id" />
                         </group>
                         <group colspan="2" col="1">
-                          <field name="photo_mini" widget='image' nolabel="1"/>
+                          <field name="photo_mini" widget='image' nolabel="1" on_change="onchange_photo_mini(photo_mini)"/>
                         </group>
                     </group>
                     <notebook colspan="6">
@@ -135,7 +135,7 @@
                     <t t-name="kanban-box">
                         <div class="oe_employee_vignette">
                             <div class="oe_employee_image">
-                                <a type="edit"><img t-att-src="kanban_image('hr.employee', 'photo', record.id.value)" class="oe_employee_picture"/></a>
+                                <a type="edit"><img t-att-src="kanban_image('hr.employee', 'photo_mini', record.id.value)" class="oe_employee_picture"/></a>
                             </div>
                             <div class="oe_employee_details">
                                 <h4><a type="edit"><field name="name"/> (<field name="login"/>)</a></h4>