[IMP]mail: display checkbox for allow to add email (from email_from value) for creating partner and send email to this new partners.

bzr revid: chm@openerp.com-20121220123122-qsqn8w97t1tre3cq

3 files changed, 71 insertions, 16 deletions

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index e154e285f39..886199a668b 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -253,6 +253,14 @@
 .openerp .oe_mail .oe_msg_composer .oe_msg_attachment_list{
     display: block;
 }
+.openerp .oe_mail .oe_msg_composer .oe_emails_from label{
+    vertical-align: middle;
+    display: block;
+    line-height: 16px;
+}
+.openerp .oe_mail .oe_msg_composer .oe_emails_from input{
+    vertical-align: middle;
+}
 .openerp .oe_mail .oe_attachment{
     display: inline-block;
     width: 100px;
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index f873daff9c3..a770b07be17 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -369,6 +369,7 @@ openerp.mail = function (session) {
             this._super(parent, datasets, options);
             this.show_compact_message = false;
             this.show_delete_attachment = true;
+            this.emails_from = [];
         },
 
         start: function () {
@@ -478,9 +479,11 @@ openerp.mail = function (session) {
             this.$('.oe_cancel').on('click', _.bind( this.on_cancel, this) );
             this.$('.oe_post').on('click', _.bind( this.on_message_post, this) );
             this.$('.oe_full').on('click', _.bind( this.on_compose_fullmail, this, this.id ? 'reply' : 'comment') );
-
+        
             /* stack for don't close the compose form if the user click on a button */
-            this.$('.oe_msg_footer').on('mousedown', _.bind( function () { this.stay_open = true; }, this));
+            this.$('.oe_msg_left, .oe_msg_center').on('mousedown', _.bind( function () { this.stay_open = true; }, this));
+            this.$('.oe_msg_left, .oe_msg_content').on('mouseup', _.bind( function () { this.$('textarea').focus(); }, this));
+
             var ev_stay = {};
             ev_stay.mouseup = ev_stay.keydown = ev_stay.focus = function () { self.stay_open = false; };
             this.$('textarea:not(.oe_compact)').on(ev_stay);
@@ -491,6 +494,8 @@ openerp.mail = function (session) {
 
             // event: delete child attachments off the oe_msg_attachment_list box
             this.$(".oe_msg_attachment_list").on('click', '.oe_delete', this.on_attachment_delete);
+
+            this.$(".oe_emails_from").on('change', 'input', this.on_checked_email_from);
         },
 
         on_compose_fullmail: function (default_composition_mode) {
@@ -568,21 +573,23 @@ openerp.mail = function (session) {
 
             if (this.do_check_attachment_upload() && (this.attachment_ids.length || body.match(/\S+/))) {
                 //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, 
-                        _.map(this.attachment_ids, function (file) {return file.id;}),
-                        this.parent_thread.context
-                    ]).done(function (record) {
+                var values = [
+                    this.context.default_res_id, //thread_id
+                    body, //body
+                    false, //subject
+                    this.context.default_parent_id, //parent_id
+                    _.map(this.attachment_ids, function (file) {return file.id;}), //attachment_ids
+                    _.map(_.filter(this.emails_from, function (f) {return f[1]}), function (f) {return f[0]}), //extra_email
+                    this.parent_thread.context, // context
+                ];
+                this.parent_thread.ds_thread.call('message_post_user_api', values).done(function (record) {
                         var thread = self.parent_thread;
                         var root = thread == self.options.root_thread;
                         if (self.options.display_indented_thread < self.thread_level && thread.parent_message) {
                             var thread = thread.parent_message.parent_thread;
                         }
                         // create object and attach to the thread object
-                        thread.message_fetch([['id', 'child_of', [self.id]]], false, [record], function (arg, data) {
+                        thread.message_fetch([["id", "=", record]], false, [record], function (arg, data) {
                             var message = thread.create_message_object( data[0] );
                             // insert the message on dom
                             thread.insert_message( message, root ? undefined : self.$el, root );
@@ -597,8 +604,8 @@ openerp.mail = function (session) {
         /* convert the compact mode into the compose message
         */
         on_compose_expandable: function (event) {
-
-            if ((!this.stay_open || (event && event.type == 'click')) && (!this.show_composer || !this.$('textarea:not(.oe_compact)').val().match(/\S+/))) {
+            this.get_emails_from();
+            if ((!this.stay_open || (event && event.type == 'click')) && (!this.show_composer || !this.$('textarea:not(.oe_compact)').val().match(/\S+/) && !this.attachment_ids.length)) {
                 this.show_composer = !this.show_composer || this.stay_open;
                 this.reinit();
             }
@@ -620,6 +627,41 @@ openerp.mail = function (session) {
             if (!this.show_composer) {
                 this.reinit();
             }
+        },
+
+        get_emails_from: function () {
+            var self = this;
+            var messages = [];
+
+            if (this.parent_thread.parent_message) {
+                // go to the parented message
+                var message = this.parent_thread.parent_message;
+                var parent_message = message.parent_id ? message.parent_thread.parent_message : message;
+                var messages = [parent_message].concat(parent_message.get_childs());
+            } else {
+                // get all wall messages
+                _.each(this.options.root_thread.messages, function (msg) {messages.push(msg); messages.concat(msg.get_childs());});
+            }
+            
+            var emails_from = _.map(_.filter(messages,
+                    function (thread) {return thread.author_id && !thread.author_id[0];}),
+                function (thread) {return thread.author_id[1];});
+
+            return _.each(emails_from, function (email_from) {
+                if (!_.find(self.emails_from, function (from) {return from[0] == email_from;})) {
+                    self.emails_from.push([email_from, true]);
+                }
+            });
+        },
+
+        on_checked_email_from: function (event) {
+            var $input = $(event.target);
+            var email = $input.attr("data");
+            _.each(this.emails_from, function (email_from) {
+                if (email_from[0] == email) {
+                    email_from[1] = $input.is(":checked");
+                }
+            });
         }
     });
 
@@ -1477,7 +1519,7 @@ openerp.mail = function (session) {
             $(window).resize( _.bind(this.thread.on_scroll, this.thread) );
             this.$el.resize( _.bind(this.thread.on_scroll, this.thread) );
             window.setTimeout( _.bind(this.thread.on_scroll, this.thread), 500 );
-        }
+        },
     });
 
 
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 3c510813029..168f32a9d7e 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -27,6 +27,11 @@
             <div class="oe_msg_center">
                 <div class="oe_msg_content">
                     <t t-call="mail.thread.list_recipients"/>
+                    <div class="oe_emails_from" t-if="widget.emails_from.length">
+                        <t t-foreach='widget.emails_from' t-as='email_from'>
+                            <label><input type="checkbox" t-att-checked="email_from[1] ? 'checked' : undefind" t-att-data="email_from[0]"/> <t t-raw="email_from[0]"/></label>
+                        </t>
+                    </div>
                     <textarea class="field_text"></textarea>
                 </div>
                 <div class="oe_msg_footer">
@@ -79,7 +84,7 @@
                         <img t-att-src="'/mail/static/src/img/mimetypes/' + attachment.filetype + '.png'"></img>
                         <div class='oe_name'><t t-raw='attachment.name' /></div>
                     </a>
-                    <div class='oe_delete oe_e' title="Delete this attachment" t-attf-data-id="{attachment.id}">[</div>
+                    <div class='oe_delete oe_e' title="Delete this attachment" t-att-data-id="attachment.id">[</div>
                     <div class='oe_progress_bar'>
                         uploading
                     </div>
@@ -91,7 +96,7 @@
                         <img t-att-src="widget.attachments_resize_image(attachment.id, [100,80])"></img>
                         <div class='oe_name'><t t-raw='attachment.name' /></div>
                     </a>
-                    <div class='oe_delete oe_e'>[</div>
+                    <div class='oe_delete oe_e' title="Delete this attachment" t-att-data-id="attachment.id">[</div>
                     <div class='oe_progress_bar'>
                         uploading
                     </div>