From 48c6ea72ff94a156995aeb08089dab9bfec4e11c Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 30 Nov 2012 10:06:55 +0100
Subject: [PATCH 01/17] [FIX] web form : catch and display error when there are
 an error in an attachment upload

bzr revid: chm@openerp.com-20121130090655-gmymwe1z1ofl7wn9
---
 addons/mail/static/src/js/mail.js | 56 ++++++++++++++++++++-----------
 1 file changed, 36 insertions(+), 20 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index a5beaac229f..e08f828d272 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -422,15 +422,25 @@ openerp.mail = function (session) {
         /* when the file is uploaded 
         */
         on_attachment_loaded: function (event, result) {
-            for (var i in this.attachment_ids) {
-                if (this.attachment_ids[i].filename == result.filename && this.attachment_ids[i].upload) {
-                    this.attachment_ids[i]={
-                        'id': result.id,
-                        'name': result.name,
-                        'filename': result.filename,
-                        'url': mail.ChatterUtils.get_attachment_url(this.session, result)
-                    };
+
+            if (result.erorr || !result.id ) {
+
+                this.do_warn(result.title, result.erorr);
+                this.attachment_ids = _.filter(this.attachment_ids, function (val) { return !val.upload; });
+                
+            } else {
+
+                for (var i in this.attachment_ids) {
+                    if (this.attachment_ids[i].filename == result.filename && this.attachment_ids[i].upload) {
+                        this.attachment_ids[i]={
+                            'id': result.id,
+                            'name': result.name,
+                            'filename': result.filename,
+                            'url': mail.ChatterUtils.get_attachment_url(this.session, result)
+                        };
+                    }
                 }
+
             }
             this.display_attachments();
 
@@ -486,6 +496,11 @@ openerp.mail = function (session) {
         },
 
         on_compose_fullmail: function (default_composition_mode) {
+
+            if(!this.do_check_attachment_upload()) {
+                return false;
+            }
+
             if (default_composition_mode == 'reply') {
                 var context = {
                     'default_composition_mode': default_composition_mode,
@@ -536,31 +551,32 @@ openerp.mail = function (session) {
             this.reinit();
         },
 
+        /* return true if all file are complete else return false and make an alert */
+        do_check_attachment_upload: function () {
+            if (_.find(this.attachment_ids, function (file) {return file.upload;})) {
+                this.do_warn(session.web._t('Attachment error :'), session.web._t('Please, wait while the file is uploading.'));
+                return false;
+            } else {
+                return true;
+            }
+        },
+
         /*post a message and fetch the message*/
         on_message_post: function (event) {
             var self = this;
 
             var comment_node =  this.$('textarea');
             var body = comment_node.val();
-            comment_node.val('');
 
-            var attachments=[];
-            for (var i in this.attachment_ids) {
-                if (this.attachment_ids[i].upload) {
-                    session.web.dialog($('<div>' + session.web.qweb.render('CrashManager.warning', {message: 'Please, wait while the file is uploading.'}) + '</div>'));
-                    return false;
-                }
-                attachments.push(this.attachment_ids[i].id);
-            }
-
-            if (body.match(/\S+/)) {
+            if (this.do_check_attachment_upload() && (this.attachment_ids.length || body.match(/\S+/))) {
+                comment_node.val('');
                 //session.web.blockUI();
                 this.parent_thread.ds_thread.call('message_post_user_api', [
                         this.context.default_res_id, 
                         body, 
                         false, 
                         this.context.default_parent_id, 
-                        attachments,
+                        _.map(this.attachment_ids, function (file) {return file.id;}),
                         this.parent_thread.context
                     ]).done(function (record) {
                         var thread = self.parent_thread;

From 61065b6d04248aa496765e1035c4c90cbdc38de7 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 30 Nov 2012 12:09:02 +0100
Subject: [PATCH 02/17] [IMP] mail: change access for create message for the
 attachments

bzr revid: chm@openerp.com-20121130110902-1qzmgvinhc0q0i3j
---
 addons/mail/mail_message.py                | 4 ++--
 addons/mail/static/src/js/mail.js          | 3 +--
 addons/portal/security/ir.model.access.csv | 1 +
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 3273870f5e0..8bb33df6d20 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -631,8 +631,8 @@ class mail_message(osv.Model):
             model_obj = self.pool.get(model)
             mids = model_obj.exists(cr, uid, mids)
             if operation in ['create', 'write', 'unlink']:
-                model_obj.check_access_rights(cr, uid, 'write')
-                model_obj.check_access_rule(cr, uid, mids, 'write', context=context)
+                model_obj.check_access_rights(cr, uid, 'read')
+                model_obj.check_access_rule(cr, uid, mids, 'read', context=context)
             else:
                 model_obj.check_access_rights(cr, uid, operation)
                 model_obj.check_access_rule(cr, uid, mids, operation, context=context)
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index e08f828d272..3f424eebce7 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -569,7 +569,6 @@ openerp.mail = function (session) {
             var body = comment_node.val();
 
             if (this.do_check_attachment_upload() && (this.attachment_ids.length || body.match(/\S+/))) {
-                comment_node.val('');
                 //session.web.blockUI();
                 this.parent_thread.ds_thread.call('message_post_user_api', [
                         this.context.default_res_id, 
@@ -589,8 +588,8 @@ openerp.mail = function (session) {
                             var message = thread.create_message_object( data[0] );
                             // insert the message on dom
                             thread.insert_message( message, root ? undefined : self.$el, root );
-                            self.on_cancel();
                         });
+                        self.on_cancel();
                         //session.web.unblockUI();
                     });
                 return true;
diff --git a/addons/portal/security/ir.model.access.csv b/addons/portal/security/ir.model.access.csv
index b9f98f81fd7..59ca37e213d 100644
--- a/addons/portal/security/ir.model.access.csv
+++ b/addons/portal/security/ir.model.access.csv
@@ -7,3 +7,4 @@ access_res_partner_category,res.partner_category,base.model_res_partner_category
 access_res_partner_title,res.partner_title,base.model_res_partner_title,portal.group_portal,1,0,0,0
 access_acquirer,portal.payment.acquirer,portal.model_portal_payment_acquirer,,1,0,0,0
 access_acquirer_all,portal.payment.acquirer,portal.model_portal_payment_acquirer,base.group_system,1,1,1,1
+access_ir_attachment_group_portal,ir.attachment group_portal,base.model_ir_attachment,portal.group_portal,1,0,1,0
\ No newline at end of file

From 84ac690b92d92b9ed2ce0c54ae3dfe70dd2fda47 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 7 Dec 2012 09:46:10 +0100
Subject: [PATCH 03/17] [IMP] mail: fix attachment error

bzr revid: chm@openerp.com-20121207084610-979a5om26shed1ak
---
 addons/mail/static/src/js/mail.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 2d5d3e34475..12e83f8fccf 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -422,12 +422,11 @@ openerp.mail = function (session) {
         on_attachment_loaded: function (event, result) {
 
             if (result.erorr || !result.id ) {
-
-                this.do_warn(result.title, result.erorr);
+                var error_title = result.error.split('\n')[0];
+                var error_content = result.error.replace(/^.*\n/, '');
+                this.do_warn(error_title, error_content);
                 this.attachment_ids = _.filter(this.attachment_ids, function (val) { return !val.upload; });
-                
             } else {
-
                 for (var i in this.attachment_ids) {
                     if (this.attachment_ids[i].filename == result.filename && this.attachment_ids[i].upload) {
                         this.attachment_ids[i]={
@@ -438,10 +437,8 @@ openerp.mail = function (session) {
                         };
                     }
                 }
-
             }
             this.display_attachments();
-
             var $input = this.$('input.oe_form_binary_file');
             $input.after($input.clone(true)).remove();
             this.$(".oe_attachment_file").show();

From f8c206b1b885d33286299d620c55bdcd9176b16e Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 7 Dec 2012 10:09:41 +0100
Subject: [PATCH 04/17] [IMP] mail: display message attachment error

bzr revid: chm@openerp.com-20121207090941-65b2vgwy066wlsmg
---
 addons/mail/static/src/js/mail.js   | 4 +---
 addons/mail/static/src/xml/mail.xml | 5 +++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 12e83f8fccf..e1625089a51 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -422,9 +422,7 @@ openerp.mail = function (session) {
         on_attachment_loaded: function (event, result) {
 
             if (result.erorr || !result.id ) {
-                var error_title = result.error.split('\n')[0];
-                var error_content = result.error.replace(/^.*\n/, '');
-                this.do_warn(error_title, error_content);
+                this.do_warn( session.web.qweb.render('mail.error_upload'), result.error);
                 this.attachment_ids = _.filter(this.attachment_ids, function (val) { return !val.upload; });
             } else {
                 for (var i in this.attachment_ids) {
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index cca908a5d98..f10770a27e1 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -179,6 +179,11 @@
         <div class="oe_view_nocontent">No messages.</div>
     </t>
 
+    <!--
+        error message for uploading
+        -->
+    <t t-name="mail.error_upload">Uploading error</t>
+
     <!--
         record_thread main template
         Template used to display the communication history in documents

From cf6b95e613184ebaad852252f790b99b9ec3d599 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 7 Dec 2012 10:28:06 +0100
Subject: [PATCH 05/17] [IMP] mail: message error when the user must wait his
 attachment uploading

bzr revid: chm@openerp.com-20121207092806-w20k150gnvs4hufj
---
 addons/mail/static/src/js/mail.js   | 2 +-
 addons/mail/static/src/xml/mail.xml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index e1625089a51..99330e7a3df 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -547,7 +547,7 @@ openerp.mail = function (session) {
         /* return true if all file are complete else return false and make an alert */
         do_check_attachment_upload: function () {
             if (_.find(this.attachment_ids, function (file) {return file.upload;})) {
-                this.do_warn(session.web._t('Attachment error :'), session.web._t('Please, wait while the file is uploading.'));
+                this.do_warn(session.web.qweb.render('mail.error_upload'), session.web.qweb.render('mail.error_upload_please_wait'));
                 return false;
             } else {
                 return true;
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index f10770a27e1..5e978e9d5b3 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -183,6 +183,7 @@
         error message for uploading
         -->
     <t t-name="mail.error_upload">Uploading error</t>
+    <t t-name="mail.error_upload_please_wait">Please, wait while the file is uploading.</t>
 
     <!--
         record_thread main template

From 97505900e6a4d70db1cfb93959cc80a1316bf083 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 7 Dec 2012 11:44:56 +0100
Subject: [PATCH 06/17] [FIX]mail: fix access right

bzr revid: chm@openerp.com-20121207104456-y148tuko1b0y7az8
---
 addons/mail/mail_message.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index c1be0a16f3f..aec106f766b 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -631,8 +631,8 @@ class mail_message(osv.Model):
             model_obj = self.pool.get(model)
             mids = model_obj.exists(cr, uid, mids)
             if operation in ['create', 'write', 'unlink']:
-                model_obj.check_access_rights(cr, uid, 'read')
-                model_obj.check_access_rule(cr, uid, mids, 'read', context=context)
+                model_obj.check_access_rights(cr, uid, 'write')
+                model_obj.check_access_rule(cr, uid, mids, 'write', context=context)
             else:
                 model_obj.check_access_rights(cr, uid, operation)
                 model_obj.check_access_rule(cr, uid, mids, operation, context=context)

From 74d514a213d4b11dd765304629f75be5de877c93 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 7 Dec 2012 14:11:18 +0100
Subject: [PATCH 07/17] [IMP]mail: add a download_attachment_ids field. the
 controler can access ton the content of attachemnt with mail security

bzr revid: chm@openerp.com-20121207131118-l88qnfn06aem7ey1
---
 addons/mail/mail_message.py       | 13 ++++++++++++-
 addons/mail/static/src/js/mail.js |  8 ++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index aec106f766b..584ab3d104d 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -118,6 +118,16 @@ class mail_message(osv.Model):
             res.append((message.id, self._shorten_name(name.lstrip(' :'))))
         return res
 
+    def _download_attachment(self, cr, uid, ids, name, arg, context=None):
+        """ Return the content of linked attachments. """
+        result = dict.fromkeys(ids, [])
+        ir_attachment_obj = self.pool.get('ir.attachment')
+        for message in self.read(cr, uid, ids, ['attachment_ids'], context=context):
+            if message.get('attachment_ids'):
+                result[message['id']] = ir_attachment_obj.read(cr, SUPERUSER_ID, list(message.get('attachment_ids')), ['id', 'datas_fname', 'datas', 'type'], context=context)
+        
+        return result
+
     _columns = {
         'type': fields.selection([
                         ('email', 'Email'),
@@ -137,6 +147,7 @@ class mail_message(osv.Model):
             help='Partners that have a notification pushing this message in their mailboxes'),
         'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel',
             'message_id', 'attachment_id', 'Attachments'),
+        'download_attachment_ids':fields.function(_download_attachment, string='Attachments content'),
         'parent_id': fields.many2one('mail.message', 'Parent Message', select=True,
             ondelete='set null', help="Initial thread message."),
         'child_ids': fields.one2many('mail.message', 'parent_id', 'Child Messages'),
@@ -250,7 +261,7 @@ class mail_message(osv.Model):
         partner_tree = dict((partner[0], partner) for partner in partners)
 
         # 2. Attachments
-        attachments = ir_attachment_obj.read(cr, uid, list(attachment_ids), ['id', 'datas_fname'], context=context)
+        attachments = ir_attachment_obj.read(cr, SUPERUSER_ID, list(attachment_ids), ['id', 'datas_fname'], context=context)
         attachments_tree = dict((attachment['id'], {'id': attachment['id'], 'filename': attachment['datas_fname']}) for attachment in attachments)
 
         # 3. Update message dictionaries
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 99330e7a3df..f67145e49e3 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -29,8 +29,8 @@ openerp.mail = function (session) {
         },
 
         /* Get the url of an attachment {'id': id} */
-        get_attachment_url: function (session, attachment) {
-            return session.url('/web/binary/saveas', {model: 'ir.attachment', field: 'datas', filename_field: 'datas_fname', id: attachment['id']});
+        get_attachment_url: function (session, id_message, id_attachment) {
+            return session.url('/web/binary/mail', {'id_message': id_message, 'id_attachment': id_attachment});
         },
 
         /**
@@ -258,7 +258,7 @@ openerp.mail = function (session) {
             for (var l in this.attachment_ids) {
                 var attach = this.attachment_ids[l];
                 if (!attach.formating) {
-                    attach.url = mail.ChatterUtils.get_attachment_url(this.session, attach);
+                    attach.url = mail.ChatterUtils.get_attachment_url(this.session, this.id, attach.id);
                     attach.filetype = mail.ChatterUtils.filetype(attach.filename);
                     attach.name = mail.ChatterUtils.breakword(attach.name || attach.filename);
                     attach.formating = true;
@@ -431,7 +431,7 @@ openerp.mail = function (session) {
                             'id': result.id,
                             'name': result.name,
                             'filename': result.filename,
-                            'url': mail.ChatterUtils.get_attachment_url(this.session, result)
+                            'url': mail.ChatterUtils.get_attachment_url(this.session, this.id, result.id)
                         };
                     }
                 }

From 7b2bf84cfe90c0c54cf873c84c6b3c97417586e9 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 10 Dec 2012 12:28:30 +0100
Subject: [PATCH 08/17] [IMP] mail: download attachment with the controler
 /web/binary/download_attachment

bzr revid: chm@openerp.com-20121210112830-gt1qs028p3cgp9dp
---
 addons/mail/mail_message.py         | 33 +++++++++++++++++++----------
 addons/mail/static/src/js/mail.js   |  9 ++++++--
 addons/mail/static/src/xml/mail.xml |  4 ++--
 3 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 584ab3d104d..cadffee7997 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -28,6 +28,12 @@ from openerp.osv import osv, orm, fields
 from openerp.tools import html_email_clean
 from openerp.tools.translate import _
 
+# import for downloading attachments
+import werkzeug.wrappers
+import werkzeug.exceptions
+import base64
+import urllib2
+
 _logger = logging.getLogger(__name__)
 
 try:
@@ -118,16 +124,6 @@ class mail_message(osv.Model):
             res.append((message.id, self._shorten_name(name.lstrip(' :'))))
         return res
 
-    def _download_attachment(self, cr, uid, ids, name, arg, context=None):
-        """ Return the content of linked attachments. """
-        result = dict.fromkeys(ids, [])
-        ir_attachment_obj = self.pool.get('ir.attachment')
-        for message in self.read(cr, uid, ids, ['attachment_ids'], context=context):
-            if message.get('attachment_ids'):
-                result[message['id']] = ir_attachment_obj.read(cr, SUPERUSER_ID, list(message.get('attachment_ids')), ['id', 'datas_fname', 'datas', 'type'], context=context)
-        
-        return result
-
     _columns = {
         'type': fields.selection([
                         ('email', 'Email'),
@@ -147,7 +143,6 @@ class mail_message(osv.Model):
             help='Partners that have a notification pushing this message in their mailboxes'),
         'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel',
             'message_id', 'attachment_id', 'Attachments'),
-        'download_attachment_ids':fields.function(_download_attachment, string='Attachments content'),
         'parent_id': fields.many2one('mail.message', 'Parent Message', select=True,
             ondelete='set null', help="Initial thread message."),
         'child_ids': fields.one2many('mail.message', 'parent_id', 'Child Messages'),
@@ -206,6 +201,22 @@ class mail_message(osv.Model):
                 self.write(cr, SUPERUSER_ID, message.get('id'), {'vote_user_ids': [(3, uid)]}, context=context)
         return new_has_voted or False
 
+    #------------------------------------------------------
+    # download an attachment
+    #------------------------------------------------------
+
+    def download_attachment(self, cr, uid, id_message, attachment_id, context=None):
+        """ Return the content of linked attachments. """
+        message  = self.read(cr, uid, [id_message], ['attachment_ids'], context=context)[0]
+        if message and message.get('attachment_ids') and attachment_id in message.get('attachment_ids'):
+            attachment = self.pool.get('ir.attachment').read(cr, SUPERUSER_ID, [attachment_id], ['id', 'datas_fname', 'datas'], context=context)[0]
+            if attachment['datas_fname'] and attachment['datas']:
+                return {
+                    'base64': attachment['datas'],
+                    'filename': attachment['datas_fname'],
+                }
+        return False
+
     #------------------------------------------------------
     # Favorite
     #------------------------------------------------------
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index f67145e49e3..a0b39830ae3 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -29,8 +29,13 @@ openerp.mail = function (session) {
         },
 
         /* Get the url of an attachment {'id': id} */
-        get_attachment_url: function (session, id_message, id_attachment) {
-            return session.url('/web/binary/mail', {'id_message': id_message, 'id_attachment': id_attachment});
+        get_attachment_url: function (session, message_id, attachment_id) {
+            return session.url('/web/binary/download_attachment', {
+                'model': 'mail.message',
+                'id': message_id,
+                'method': 'download_attachment',
+                'attachment_id': attachment_id
+            });
         },
 
         /**
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 5e978e9d5b3..67449cca0ba 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -75,7 +75,7 @@
         <t t-foreach='widget.attachment_ids' t-as='attachment'>
             <t t-if="attachment.filetype !== 'webimage'">
                 <div t-attf-class="oe_attachment #{attachment.upload ? 'oe_uploading' : ''}">
-                    <a t-att-href='attachment.url'>
+                    <a t-att-href='attachment.url' target="_blank">
                         <img t-att-src="'/mail/static/src/img/mimetypes/' + attachment.filetype + '.png'"></img>
                         <div class='oe_name'><t t-raw='attachment.name' /></div>
                     </a>
@@ -87,7 +87,7 @@
             </t>
             <t t-if="attachment.filetype === 'webimage'">
                 <div t-attf-class="oe_attachment oe_preview #{attachment.upload ? 'oe_uploading' : ''}">
-                    <a t-att-href='attachment.url'>
+                    <a t-att-href='attachment.url' target="_blank">
                         <img t-att-src="widget.attachments_resize_image(attachment.id, [100,80])"></img>
                         <div class='oe_name'><t t-raw='attachment.name' /></div>
                     </a>

From b9eb2afac5dad67a93d1c1b3ce9beb64a24eede2 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 10 Dec 2012 14:25:52 +0100
Subject: [PATCH 09/17] [IMP]mail: remove import

bzr revid: chm@openerp.com-20121210132552-3o8jop7p6tnhq73s
---
 addons/mail/mail_message.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index cadffee7997..b2a556d61f0 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -28,12 +28,6 @@ from openerp.osv import osv, orm, fields
 from openerp.tools import html_email_clean
 from openerp.tools.translate import _
 
-# import for downloading attachments
-import werkzeug.wrappers
-import werkzeug.exceptions
-import base64
-import urllib2
-
 _logger = logging.getLogger(__name__)
 
 try:

From ce54a91deef193b85ba7b3dc2724172f6c9d0352 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 10 Dec 2012 14:35:40 +0100
Subject: [PATCH 10/17] [IMP]mail: read to browse

bzr revid: chm@openerp.com-20121210133540-p5kurxjjflfyzru1
---
 addons/mail/mail_message.py | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index b2a556d61f0..81cf3256bf6 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -201,13 +201,13 @@ class mail_message(osv.Model):
 
     def download_attachment(self, cr, uid, id_message, attachment_id, context=None):
         """ Return the content of linked attachments. """
-        message  = self.read(cr, uid, [id_message], ['attachment_ids'], context=context)[0]
-        if message and message.get('attachment_ids') and attachment_id in message.get('attachment_ids'):
-            attachment = self.pool.get('ir.attachment').read(cr, SUPERUSER_ID, [attachment_id], ['id', 'datas_fname', 'datas'], context=context)[0]
-            if attachment['datas_fname'] and attachment['datas']:
+        message = self.browse(cr, uid, id_message, context=context)
+        if attachment_id in [attachment.id for attachment in message.attachment_ids]:
+            attachment = self.pool.get('ir.attachment').browse(cr, SUPERUSER_ID, attachment_id, context=context)
+            if attachment.datas and attachment.datas_fname:
                 return {
-                    'base64': attachment['datas'],
-                    'filename': attachment['datas_fname'],
+                    'base64': attachment.datas,
+                    'filename': attachment.datas_fname,
                 }
         return False
 
@@ -498,15 +498,6 @@ class mail_message(osv.Model):
             thread_level=thread_level, message_unload_ids=message_unload_ids, domain=domain, parent_id=parent_id, context=context)
         return message_list
 
-    # TDE Note: do we need this ?
-    # def user_free_attachment(self, cr, uid, context=None):
-    #     attachment = self.pool.get('ir.attachment')
-    #     attachment_list = []
-    #     attachment_ids = attachment.search(cr, uid, [('res_model', '=', 'mail.message'), ('create_uid', '=', uid)])
-    #     if len(attachment_ids):
-    #         attachment_list = [{'id': attach.id, 'name': attach.name, 'date': attach.create_date} for attach in attachment.browse(cr, uid, attachment_ids, context=context)]
-    #     return attachment_list
-
     #------------------------------------------------------
     # mail_message internals
     #------------------------------------------------------

From 782cd23937a27faba8b60c7a93e1194de25c0984 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 10 Dec 2012 14:49:32 +0100
Subject: [PATCH 11/17] [IMP]mail: add test for download attachments

bzr revid: chm@openerp.com-20121210134932-wtu43jtpor386zab
---
 addons/mail/tests/test_mail.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index bc6df813ef7..3c696b02f38 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -421,6 +421,10 @@ class test_mail(test_mail_mockup.TestMailMockups):
             self.assertEqual(attach.res_id, self.group_pigs_id, 'mail.message attachment res_id incorrect')
             self.assertIn((attach.name, attach.datas.decode('base64')), _attachments,
                 'mail.message attachment name / data incorrect')
+        # Test: download attachments
+        for attach in message.attachment_ids:
+            dl_attach = self.mail_message.download_attachment(cr, uid, id_message=message.id, attachment_id=attach.id)
+            self.assertIn(( dl_attach['filename'], dl_attach['base64'].decode('base64') ), _attachments, 'mail.message download_attachment is incorrect')
 
         # 3. Reply to the last message, check that its parent will be the first message
         msg_id3 = self.mail_group.message_post(cr, uid, self.group_pigs_id, body='Test', parent_id=msg_id2)

From 295c36e66c5755b307caccad7ce19c08202f3814 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 10 Dec 2012 15:05:29 +0100
Subject: [PATCH 12/17] [IMP]mail: add test for access rights for download
 attachments

bzr revid: chm@openerp.com-20121210140529-w7fihmb0k1prw40a
---
 addons/mail/tests/test_mail_access_rights.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/addons/mail/tests/test_mail_access_rights.py b/addons/mail/tests/test_mail_access_rights.py
index 1b2f7f85d71..15003ca9b87 100644
--- a/addons/mail/tests/test_mail_access_rights.py
+++ b/addons/mail/tests/test_mail_access_rights.py
@@ -31,6 +31,7 @@ class test_mail_access_rights(test_mail_mockup.TestMailMockups):
         cr, uid = self.cr, self.uid
         self.mail_group = self.registry('mail.group')
         self.mail_message = self.registry('mail.message')
+        self.attachment = self.registry('ir.attachment')
         self.mail_notification = self.registry('mail.notification')
         self.res_users = self.registry('res.users')
         self.res_groups = self.registry('res.groups')
@@ -97,12 +98,16 @@ class test_mail_access_rights(test_mail_mockup.TestMailMockups):
         self.mail_group.message_post(cr, uid, self.group_pigs_id, body='Message')
         self.group_jobs_id = self.mail_group.create(cr, uid, {'name': 'Jobs', 'public': 'public'})
 
+        # prepare an attachment
+        attachment_id = self.attachment.create(cr, uid, {'datas': 'My attachment'.encode('base64'), 'name': 'doc.txt', 'datas_fname': 'doc.txt' })
+
         # ----------------------------------------
         # CASE1: Bert, basic mail.message read access
         # ----------------------------------------
 
         # Do: create a new mail.message
-        message_id = self.mail_message.create(cr, uid, {'body': 'My Body'})
+        message_id = self.mail_message.create(cr, uid, {'body': 'My Body', 'attachment_ids': [4, attachment_id] })
+
         # Test: Bert reads the message, crash because not notification/not in doc followers/not read on doc
         self.assertRaises(except_orm, self.mail_message.read,
             cr, user_bert_id, message_id)
@@ -110,11 +115,16 @@ class test_mail_access_rights(test_mail_mockup.TestMailMockups):
         notif_id = self.mail_notification.create(cr, uid, {'message_id': message_id, 'partner_id': partner_bert_id})
         # Test: Bert reads the message, ok because notification pushed
         self.mail_message.read(cr, user_bert_id, message_id)
+        # Test: Bert download attachment, ok because he can read message
+        self.mail_message.download_attachment(cr, user_bert_id, message_id, attachment_id)
         # Do: remove notification
         self.mail_notification.unlink(cr, uid, notif_id)
         # Test: Bert reads the message, crash because not notification/not in doc followers/not read on doc
         self.assertRaises(except_orm, self.mail_message.read,
             cr, self.user_bert_id, message_id)
+        # Test: Bert download attachment, crash because he can't read message
+        self.assertRaises(except_orm, self.mail_message.download_attachment,
+            cr, user_bert_id, message_id, attachment_id)
         # Do: Bert is now the author
         self.mail_message.write(cr, uid, [message_id], {'author_id': partner_bert_id})
         # Test: Bert reads the message, ok because Bert is the author

From 6c73d8dff8cb3a794a2c35e75da6b85974cc34ff Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 11 Dec 2012 15:53:43 +0100
Subject: [PATCH 13/17] [IMP] web: move controler download_attachment into
 mail.

bzr revid: chm@openerp.com-20121211145343-jhjj9sohn2shkbt9
---
 addons/mail/__init__.py             |  1 +
 addons/mail/controllers/__init__.py |  3 +++
 addons/mail/controllers/main.py     | 22 ++++++++++++++++++++++
 addons/mail/static/src/js/mail.js   |  2 +-
 4 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 addons/mail/controllers/__init__.py
 create mode 100644 addons/mail/controllers/main.py

diff --git a/addons/mail/__init__.py b/addons/mail/__init__.py
index b34993ffd32..b759a08d778 100644
--- a/addons/mail/__init__.py
+++ b/addons/mail/__init__.py
@@ -35,5 +35,6 @@ import wizard
 import res_config
 import mail_group_menu
 import update
+import controllers
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/controllers/__init__.py b/addons/mail/controllers/__init__.py
new file mode 100644
index 00000000000..e11f9ba81bb
--- /dev/null
+++ b/addons/mail/controllers/__init__.py
@@ -0,0 +1,3 @@
+import main
+
+# vim:expandtab:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/controllers/main.py b/addons/mail/controllers/main.py
new file mode 100644
index 00000000000..4c6f6e56064
--- /dev/null
+++ b/addons/mail/controllers/main.py
@@ -0,0 +1,22 @@
+import base64
+import openerp.addons.web.http as oeweb
+from openerp.addons.web.controllers.main import content_disposition
+
+#----------------------------------------------------------
+# Controller
+#----------------------------------------------------------
+class MailController(oeweb.Controller):
+    _cp_path = '/mail'
+
+    @oeweb.httprequest
+    def download_attachment(self, req, model, id, method, attachment_id, **kw):
+        Model = req.session.model(model)
+        res = getattr(Model, method)(int(id), int(attachment_id))
+        if res:
+            filecontent = base64.b64decode(res.get('base64'))
+            filename = res.get('filename')
+            if filecontent and filename:
+                return req.make_response(filecontent,
+                    headers=[('Content-Type', 'application/octet-stream'),
+                            ('Content-Disposition', content_disposition(filename, req))])
+        return req.not_found()
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index a0b39830ae3..f76e04cf540 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -30,7 +30,7 @@ openerp.mail = function (session) {
 
         /* Get the url of an attachment {'id': id} */
         get_attachment_url: function (session, message_id, attachment_id) {
-            return session.url('/web/binary/download_attachment', {
+            return session.url('/mail/download_attachment', {
                 'model': 'mail.message',
                 'id': message_id,
                 'method': 'download_attachment',

From 6576b52d42d82314df474bbfea259f394822846a Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 11 Dec 2012 15:56:32 +0100
Subject: [PATCH 14/17] [REV] Url parmaters (hence debug mode) should stay
 persistent. Use bbq api in order to remove state.

Reverted partial feature of Revision:
3509 revid:chm@openerp.com-20121128082130-x16m1x0bdsgo7grp

bzr revid: fme@openerp.com-20121211145632-yce8jyyu6k7e2lov
---
 addons/web/static/src/js/coresetup.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index 74c30334e1e..c88e0ca0512 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -119,9 +119,7 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess
     },
     session_logout: function() {
         this.set_cookie('session_id', '');
-        var url = "#";
-        $.bbq.pushState(url);
-        window.location.search = "";
+        $.bbq.removeState();
         return this.rpc("/web/session/destroy", {});
     },
     get_cookie: function (name) {

From bc8e74d8b04bc3b5a6ad23172822a3230e10baac Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 11 Dec 2012 15:56:52 +0100
Subject: [PATCH 15/17] [FIX] focusing of form fields, implementation of
 focusing for tag m2m

jQuery's *focus* method must *not* be used: it triggers the blur and
focus events in the wrong order (and potentially more than once),
breaking the focus handling of the o2m editable list and making it
essentially unusable.

The DOM method behaves correctly, triggers the blur first and the
focus second in a different runloop frame (thus it's possible to bind
on blur, wait a set time and execute the actual blurring iif no focus
event has been seen within the form).

bzr revid: xmo@openerp.com-20121211145652-y63a0ny0gmoiozhn
---
 addons/web/static/src/js/view_form.js | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index eab0b38fda1..f9956d50e17 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2275,7 +2275,7 @@ instance.web.form.FieldChar = instance.web.form.AbstractField.extend(instance.we
         return this.get('value') === '' || this._super();
     },
     focus: function() {
-        this.$('input:first').focus();
+        this.$('input:first')[0].focus();
     },
     set_dimensions: function (height, width) {
         this._super(height, width);
@@ -2510,7 +2510,7 @@ instance.web.form.FieldDatetime = instance.web.form.AbstractField.extend(instanc
     },
     focus: function() {
         if (this.datewidget && this.datewidget.$input) {
-            this.datewidget.$input.focus();
+            this.datewidget.$input[0].focus();
         }
     },
     set_dimensions: function (height, width) {
@@ -2584,7 +2584,7 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(instance.we
         return this.get('value') === '' || this._super();
     },
     focus: function($el) {
-        this.$textarea.focus();
+        this.$textarea[0].focus();
     },
     set_dimensions: function (height, width) {
         this._super(height, width);
@@ -2665,7 +2665,7 @@ instance.web.form.FieldBoolean = instance.web.form.AbstractField.extend({
         this.$checkbox[0].checked = this.get('value');
     },
     focus: function() {
-        this.$checkbox.focus();
+        this.$checkbox[0].focus();
     }
 });
 
@@ -2751,7 +2751,7 @@ instance.web.form.FieldSelection = instance.web.form.AbstractField.extend(instan
         }
     },
     focus: function() {
-        this.$el.find('select:first').focus();
+        this.$('select:first')[0].focus();
     },
     set_dimensions: function (height, width) {
         this._super(height, width);
@@ -3237,7 +3237,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
     },
     focus: function () {
         if (!this.get('effective_readonly')) {
-            this.$input.focus();
+            this.$input[0].focus();
         }
     },
     _quick_create: function() {
@@ -4087,6 +4087,9 @@ instance.web.form.FieldMany2ManyTags = instance.web.form.AbstractField.extend(in
     add_id: function(id) {
         this.set({'value': _.uniq(this.get('value').concat([id]))});
     },
+    focus: function () {
+        this.$text[0].focus();
+    },
 });
 
 /**
@@ -4423,7 +4426,7 @@ instance.web.form.Many2ManyQuickCreate = instance.web.Widget.extend({
         });
     },
     focus: function() {
-        this.$text.focus();
+        this.$text[0].focus();
     },
     add_id: function(id) {
         var self = this;

From f365052c6c1de5c7ea974b59bf05efe90f1be548 Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Tue, 11 Dec 2012 16:04:19 +0100
Subject: [PATCH 16/17] [IMP] analytic: 'code' field: remove size limit

bzr revid: olt@tinyerp.com-20121211150419-2sh2n255ej9bewgo
---
 addons/analytic/analytic.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 782fbc4f3ee..420c6516b38 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -166,7 +166,7 @@ class account_analytic_account(osv.osv):
     _columns = {
         'name': fields.char('Account/Contract Name', size=128, required=True),
         'complete_name': fields.function(_get_full_name, type='char', string='Full Account Name'),
-        'code': fields.char('Reference', size=24, select=True),
+        'code': fields.char('Reference', select=True),
         'type': fields.selection([('view','Analytic View'), ('normal','Analytic Account'),('contract','Contract or Project'),('template','Template of Contract')], 'Type of Account', required=True,
                                  help="If you select the View Type, it means you won\'t allow to create journal entries using that account.\n"\
                                   "The type 'Analytic account' stands for usual accounts that you only want to use in accounting.\n"\

From d63db5ef0ae0bec6405d774e8b628097606d8fef Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 11 Dec 2012 16:18:24 +0100
Subject: [PATCH 17/17] [FIX] Once DB Manager's 'Back to Login' button is used,
 logging in won't show application.

bzr revid: fme@openerp.com-20121211151824-ywcuhi4hdcvphn7g
---
 addons/web/static/src/js/chrome.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index be88f89e711..afd311c72ad 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -565,8 +565,7 @@ instance.web.DatabaseManager = instance.web.Widget.extend({
     },
     do_exit: function () {
         this.$el.remove();
-        instance.webclient.toggle_bars(false);
-        this.do_action('login');
+        instance.webclient.show_login();
     }
 });
 instance.web.client_actions.add("database_manager", "instance.web.DatabaseManager");