[MERGE] forward port branch saas-16 up to 64d56995e04

3 files changed, 64 insertions, 1 deletions

diff --git a/addons/mail/controllers/main.py b/addons/mail/controllers/main.py
index c1b4433e74a..25ea7b008ce 100644
--- a/addons/mail/controllers/main.py
+++ b/addons/mail/controllers/main.py
@@ -77,7 +77,10 @@ class MailController(http.Controller):
                 record_action = record_sudo.get_access_action(access_uid=uid)
         else:
             record_action = record_sudo.get_access_action()
+            if record_action['type'] == 'ir.actions.act_url' and record_action.get('target_type') != 'public':
+                return cls._redirect_to_messaging()
 
+        record_action.pop('target_type', None)
         # the record has an URL redirection: use it directly
         if record_action['type'] == 'ir.actions.act_url':
             return werkzeug.utils.redirect(record_action['url'])
diff --git a/addons/mail/static/src/js/many2many_tags_email.js b/addons/mail/static/src/js/many2many_tags_email.js
index 382efabbd35..c566d2a4706 100644
--- a/addons/mail/static/src/js/many2many_tags_email.js
+++ b/addons/mail/static/src/js/many2many_tags_email.js
@@ -28,7 +28,7 @@ BasicModel.include({
         var localID = (record._changes && fieldName in record._changes) ?
                         record._changes[fieldName] :
                         record.data[fieldName];
-        var list = this.localData[localID];
+        var list = this._applyX2ManyOperations(this.localData[localID]);
         var invalidPartnerIds = [];
         _.each(list.data, function (id) {
             var record = self.localData[id];
diff --git a/addons/mail/static/tests/chatter_tests.js b/addons/mail/static/tests/chatter_tests.js
index b5d7feab56e..c650f8c10c9 100644
--- a/addons/mail/static/tests/chatter_tests.js
+++ b/addons/mail/static/tests/chatter_tests.js
@@ -1064,5 +1064,65 @@ QUnit.test('fieldmany2many tags email', function (assert) {
     $('.modal-footer .btn-primary').click();
 });
 
+QUnit.test('fieldmany2many tags email (edition)', function (assert) {
+    assert.expect(15);
+
+    this.data.partner.records[0].timmy = [12];
+
+    var form = createView({
+        View: FormView,
+        model: 'partner',
+        data: this.data,
+        res_id: 1,
+        arch:'<form string="Partners">' +
+                '<sheet>' +
+                    '<field name="display_name"/>' +
+                    '<field name="timmy" widget="many2many_tags_email"/>' +
+                '</sheet>' +
+            '</form>',
+        viewOptions: {
+            mode: 'edit',
+        },
+        mockRPC: function (route, args) {
+            if (args.method ==='read' && args.model === 'partner_type') {
+                assert.step(args.args[0]);
+                assert.deepEqual(args.args[1] , ['display_name', 'email'], "should read the email");
+            }
+            return this._super.apply(this, arguments);
+        },
+        archs: {
+            'partner_type,false,form': '<form string="Types"><field name="display_name"/><field name="email"/></form>',
+        },
+    });
+
+    assert.verifySteps([[12]]);
+    assert.strictEqual(form.$('.o_field_many2manytags[name="timmy"] span.o_tag_color_10').length, 1,
+        "should contain one tag");
+
+    // add an other existing tag
+    var $input = form.$('.o_field_many2manytags input');
+    $input.click(); // opens the dropdown
+    $input.autocomplete('widget').find('li:first').click(); // add 'silver'
+
+    assert.strictEqual($('.modal-body.o_act_window').length, 1,
+        "there should be one modal opened to edit the empty email");
+    assert.strictEqual($('.modal-body.o_act_window input[name="display_name"]').val(), "silver",
+        "the opened modal should be a form view dialog with the partner_type 14");
+    assert.strictEqual($('.modal-body.o_act_window input[name="email"]').length, 1,
+        "there should be an email field in the modal");
+
+    // set the email and save the modal (will rerender the form view)
+    $('.modal-body.o_act_window input[name="email"]').val('coucou@petite.perruche').trigger('input');
+    $('.modal-footer .btn-primary').click();
+
+    assert.strictEqual(form.$('.o_field_many2manytags[name="timmy"] span.o_tag_color_10').length, 2,
+        "should contain the second tag");
+    // should have read [14] three times: when opening the dropdown, when opening the modal, and
+    // after the save
+    assert.verifySteps([[12], [14], [14], [14]]);
+
+    form.destroy();
+});
+
 });
 });