[MERGE] Merged a Mail update

This web revision adds a resize key in the attachment controler to receive resized image when accessing some attachments. This is used for the preview in Chatter, to avoid pre-visualizing the whole images.

bzr revid: tde@openerp.com-20121112154956-w4iyroc3hfmxn9l0

addons/web/controllers/main.py

@@ -1455,11 +1455,24 @@ class Binary(openerpweb.Controller):
         try:
             if not id:
                 res = Model.default_get([field], context).get(field)
-                image_data = base64.b64decode(res)
+                image_base64 = res
             else:
                 res = Model.read([id], [last_update, field], context)[0]
                 retag = hashlib.md5(res.get(last_update)).hexdigest()
-                image_data = base64.b64decode(res.get(field))
+                image_base64 = res.get(field)
+
+            if kw.get('resize'):
+                resize = kw.get('resize').split(',');
+                if len(resize) == 2 and int(resize[0]) and int(resize[1]):
+                    width = int(resize[0])
+                    height = int(resize[1])
+                    # resize maximum 500*500
+                    if width > 500: width = 500
+                    if height > 500: height = 500
+                    image_base64 = openerp.tools.image_resize_image(base64_source=image_base64, size=(width, height), encoding='base64', filetype='PNG')
+            
+            image_data = base64.b64decode(image_base64)
+
         except (TypeError, xmlrpclib.Fault):
             image_data = self.placeholder(req)
         headers.append(('ETag', retag))

addons/web/static/src/js/view_form.js

@@ -5026,7 +5026,7 @@ instance.web.form.FieldOne2ManyBinaryMultiFiles = instance.web.form.AbstractFiel
             }
 
             // block UI or not
-            if(this.node.attrs.blockui) {
+            if(this.node.attrs.blockui>0) {
                 instance.web.blockUI();
             }
 
@@ -5060,7 +5060,7 @@ instance.web.form.FieldOne2ManyBinaryMultiFiles = instance.web.form.AbstractFiel
     },
     on_file_loaded: function (event, result) {
         // unblock UI
-        if(this.node.attrs.blockui) {
+        if(this.node.attrs.blockui>0) {
             instance.web.unblockUI();
         }
 

addons/web/static/src/xml/base.xml

@@ -1182,26 +1182,28 @@
 </t>
 <t t-name="FieldBinaryFileUploader.files">
     <div class="oe_attachments">
-        <t t-if="!widget.get('effective_readonly')" t-foreach="widget.get('value')" t-as="file">
-            <div class="oe_attachment">
-                <span t-if="(file.upload or file.percent_loaded&lt;100)" t-attf-title="{(file.name || file.filename) + (file.date?' \n('+file.date+')':'' )}" t-attf-name="{file.name || file.filename}">
-                    <span class="oe_fileuploader_in_process">...Upload in progress...</span>
-                    <t t-raw="file.name || file.filename"/>
-                </span>
-                <a t-if="(!file.upload or file.percent_loaded&gt;=100)" t-att-href="file.url" t-attf-title="{(file.name || file.filename) + (file.date?' \n('+file.date+')':'' )}">
-                    <t t-raw="file.name || file.filename"/>
-                </a>
-                <t t-if="(!file.upload or file.percent_loaded&gt;=100)">
-                    <a class="oe_right oe_delete oe_e" title="Delete this file" t-attf-data-id="{file.id}">[</a>
-                </t>
-            </div>
-        </t>
-        <t t-if="widget.get('effective_readonly')" t-foreach="widget.get('value')" t-as="file">
-            <div>
-                <a t-att-href="file.url" t-attf-title="{(file.name || file.filename) + (file.date?' \n('+file.date+')':'' )}">
-                    <t t-raw="file.name || file.filename"/>
-                </a>
-            </div>
+        <t t-if="widget.get('value')">
+            <t t-if="!widget.get('effective_readonly')" t-foreach="widget.get('value')" t-as="file">
+                <div class="oe_attachment">
+                    <span t-if="(file.upload or file.percent_loaded&lt;100)" t-attf-title="{(file.name || file.filename) + (file.date?' \n('+file.date+')':'' )}" t-attf-name="{file.name || file.filename}">
+                        <span class="oe_fileuploader_in_process">...Upload in progress...</span>
+                        <t t-raw="file.name || file.filename"/>
+                    </span>
+                    <a t-if="(!file.upload or file.percent_loaded&gt;=100)" t-att-href="file.url" t-attf-title="{(file.name || file.filename) + (file.date?' \n('+file.date+')':'' )}">
+                        <t t-raw="file.name || file.filename"/>
+                    </a>
+                    <t t-if="(!file.upload or file.percent_loaded&gt;=100)">
+                        <a class="oe_right oe_delete oe_e" title="Delete this file" t-attf-data-id="{file.id}">[</a>
+                    </t>
+                </div>
+            </t>
+            <t t-if="widget.get('effective_readonly')" t-foreach="widget.get('value')" t-as="file">
+                <div>
+                    <a t-att-href="file.url" t-attf-title="{(file.name || file.filename) + (file.date?' \n('+file.date+')':'' )}">
+                        <t t-raw="file.name || file.filename"/>
+                    </a>
+                </div>
+            </t>
         </t>
     </div>
 </t>