Merge lp:~openerp-dev/openobject-addons/trunk-project-onboarding-imp-demo_data-msa into lp:~openerp-dev/openobject-addons/trunk-project-onboarding

[Mitesh Savani (OpenERP)]

[IMP] add demo data attachment in message of project.task.

[Stephane Wirtel (OpenERP) (stephane-openerp)]

your patch is wrong.

for the python part:

1. use the lower for type_image

   example: allow_extensions = ['.jpg', '.png', '.jpeg', '.gif']
   for attachment in message.attachment_ids if attachment.datas_fname.lower()[-4:] in allow_extensions

2. it's "attachment" and not "attchment" in english.

Thank you

review: Needs Fixing

=== modified file 'project/project.py'
--- project/project.py	2014-05-08 07:32:31 +0000
+++ project/project.py	2014-05-08 11:08:52 +0000
@@ -798,12 +798,14 @@
 
     def _get_attachments(self, cr, uid, ids, field_name, arg, context):
         res = {}
+        type_image = ['.jpg','.png','jpeg','.gif','.JPG','.PNG','.JPEG','GIF']
         message_obj = self.pool['mail.message']
+        #show only image type attachments order by votes.
         for result in self.browse(cr, uid, ids, context=context):
             messages = message_obj.search(cr, uid, [('res_id','=',result.id),('model','=','project.task'),('attachment_ids', '!=', False)], context=context)
             attacments = []
             for message in message_obj.browse(cr, uid, messages, context=context):
-                attacments += [(attchment.id,len(message.vote_user_ids)) for attchment in message.attachment_ids]
+                attacments += [(attchment.id,len(message.vote_user_ids)) for attchment in message.attachment_ids if attchment.datas_fname[-4:] in type_image]
             attachment_ids = sorted(attacments, key=lambda element: (element[1]), reverse=True)
             res[result.id] = [attachment[0] for attachment in attachment_ids]
         return res

=== modified file 'project/project_onboarding_demo.xml'
--- project/project_onboarding_demo.xml	2014-04-29 08:48:00 +0000
+++ project/project_onboarding_demo.xml	2014-05-08 11:08:52 +0000
@@ -23,6 +23,23 @@
             <field name="color">3</field>
         </record>
 
+        <!-- Admin and Demo with attachments -->
+        <record id="message_onboard_task_1_attach1" model="ir.attachment">
+            <field name="datas_fname">project_dragdrop.jpeg</field>
+            <field name="name">project_dragdrop</field>
+            <field name="datas" type="base64" file="project/static/src/img/project_dragdrop.jpeg"/>
+            <field name="res_id" ref="project_onboard_task_1"/>
+            <field name="res_model">project.task</field>
+        </record>
+        
+        <record id="message_onboard_task_1" model="mail.message">
+            <field name="model">project.task</field>
+            <field name="res_id" ref="project_onboard_task_1"/>
+            <field name="type">comment</field>
+            <field name="author_id" ref="base.partner_root"/>
+            <field name="attachment_ids" eval="[(6, 0, [ref('message_onboard_task_1_attach1')])]"/>
+        </record>
+
         <record id="project_onboard_task_2" model="project.task">
             <field name="priority">4</field>
             <field name="project_id" ref="project.project_project_onboard"/>
@@ -59,6 +76,23 @@
             <field name="color">3</field>
         </record>
 
+        <!-- Admin and Demo with attachments -->
+        <record id="message_onboard_task_5_attach1" model="ir.attachment">
+            <field name="datas_fname">project_dragdrop.jpeg</field>
+            <field name="name">project_dragdrop</field>
+            <field name="datas" type="base64" file="project/static/src/img/more_feature.jpeg"/>
+            <field name="res_id" ref="project_onboard_task_5"/>
+            <field name="res_model">project.task</field>
+        </record>
+        
+        <record id="message_onboard_task_5" model="mail.message">
+            <field name="model">project.task</field>
+            <field name="res_id" ref="project_onboard_task_5"/>
+            <field name="type">comment</field>
+            <field name="author_id" ref="base.partner_root"/>
+            <field name="attachment_ids" eval="[(6, 0, [ref('message_onboard_task_5_attach1')])]"/>
+        </record>
+
         <record id="project_onboard_task_6" model="project.task">
             <field name="priority">4</field>
             <field name="project_id" ref="project.project_project_onboard"/>

=== added file 'project/static/src/img/more_feature.jpeg'
Binary files project/static/src/img/more_feature.jpeg	1970-01-01 00:00:00 +0000 and project/static/src/img/more_feature.jpeg	2014-05-08 11:08:52 +0000 differ
=== added file 'project/static/src/img/project_dragdrop.jpeg'
Binary files project/static/src/img/project_dragdrop.jpeg	1970-01-01 00:00:00 +0000 and project/static/src/img/project_dragdrop.jpeg	2014-05-08 11:08:52 +0000 differ