Merge lp:~openerp-dev/openobject-addons/7.0-fix-mail-checkbox-chm into lp:openobject-addons/7.0

[Christophe Matthieu (OpenERP)]

[lp:~openerp-dev/openobject-addons/7.0-fix-mail-checkbox-chm]

9148. By Christophe Matthieu (OpenERP) on 2013-05-22

[FIX] mail: now user can change email inside the create partner popup

Unmerged revisions

9148. By Christophe Matthieu (OpenERP) on 2013-05-22

[FIX] mail: now user can change email inside the create partner popup

=== modified file 'mail/static/src/js/mail.js'
--- mail/static/src/js/mail.js	2013-05-08 11:39:52 +0000
+++ mail/static/src/js/mail.js	2013-05-22 15:28:45 +0000
@@ -614,8 +614,6 @@
             var names_to_find = _.pluck(recipients_to_find, 'full_name');
             var recipients_to_check = _.filter(recipients, function (recipient) { return (recipient.partner_id && ! recipient.email_address) });
             var recipient_ids = _.pluck(_.filter(recipients, function (recipient) { return recipient.partner_id && recipient.email_address }), 'partner_id');
-            var names_to_remove = [];
-            var recipient_ids_to_remove = [];
 
             // have unknown names -> call message_get_partner_info_from_emails to try to find partner_id
             var find_done = $.Deferred();
@@ -632,7 +630,11 @@
             // for unknown names + incomplete partners -> open popup - cancel = remove from recipients
             $.when(find_done).pipe(function (result) {
                 var emails_deferred = [];
-                var recipient_popups = result.concat(recipients_to_check);
+                var recipient_popups = recipients_to_check.slice();
+                _.each(result, function (recipient) {
+                    recipient.find = true;
+                    recipient_popups.push(recipient);
+                });
 
                 _.each(recipient_popups, function (partner_info) {
                     var deferred = $.Deferred()
@@ -654,19 +656,29 @@
                             title: _t("Please complete partner's informations"),
                         }
                     );
-                    pop.on('closed', self, function () {
+                    pop.on('closed', pop, function () {
+                        if (parsed_email[1] != this.view_form.datarecord.email) {
+                            partner_info.full_name = this.view_form.datarecord.email;
+                        }
+                        if (!partner_id) {
+                            partner_info.partner_id = this.dataset.ids[0];
+                        }
                         deferred.resolve();
                     });
-                    pop.view_form.on('on_button_cancel', self, function () {
-                        names_to_remove.push(partner_name);
-                        if (partner_id) {
-                            recipient_ids_to_remove.push(partner_id);
-                        }
+                    pop.view_form.on('on_button_cancel', pop, function () {
+                        partner_info.remove = true;
                     });
                 });
 
                 $.when.apply($, emails_deferred).then(function () {
-                    var new_names_to_find = _.difference(names_to_find, names_to_remove);
+                    var new_names_to_find = [];
+                    _.each(recipient_popups, function (recipient) {
+                        if (recipient.find && !recipient.remove) {
+                            new_names_to_find.push(recipient.full_name)
+                        }
+                    });
+                    recipient_popups = _.filter(recipient_popups, function (recipient) { return !recipient.find;});
+
                     find_done = $.Deferred();
                     if (new_names_to_find.length > 0) {
                         var values = {
@@ -679,9 +691,8 @@
                         find_done.resolve([]);
                     }
                     $.when(find_done).pipe(function (result) {
-                        var recipient_popups = result.concat(recipients_to_check);
-                        _.each(recipient_popups, function (partner_info) {
-                            if (partner_info.partner_id && _.indexOf(partner_info.partner_id, recipient_ids_to_remove) == -1) {
+                        _.each(result.concat(recipient_popups), function (partner_info) {
+                            if (partner_info.partner_id && !partner_info.remove) {
                                 recipient_ids.push(partner_info.partner_id);
                             }
                         });