From 3fa2ca07794594d34c4623e4509650b6300bf189 Mon Sep 17 00:00:00 2001
From: Simon Lejeune <sle@openerp.com>
Date: Thu, 16 Aug 2018 17:24:01 +0200
Subject: [PATCH] [FIX] web: no_open in field options no longer working

example: <field name="product_id" options="{'no_open': True}" readonly="1"/>

This has been broken by rev. 43d21dd9c due to misplaced parentheses
(an empty object in javascript being truthy).
---
 .../static/src/js/fields/relational_fields.js |  2 +-
 addons/web/static/src/xml/base.xml            |  2 +-
 .../tests/fields/relational_fields_tests.js   | 35 ++++++++++---------
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/addons/web/static/src/js/fields/relational_fields.js b/addons/web/static/src/js/fields/relational_fields.js
index 692d27e0ca8..65ec9f33ddf 100644
--- a/addons/web/static/src/js/fields/relational_fields.js
+++ b/addons/web/static/src/js/fields/relational_fields.js
@@ -126,7 +126,7 @@ var FieldMany2One = AbstractField.extend({
         this.nodeOptions = _.defaults(this.nodeOptions, {
             quick_create: true,
         });
-        this.noOpen = ('noOpen' in options || {}) ? options.noOpen : this.nodeOptions.no_open;
+        this.noOpen = 'noOpen' in (options || {}) ? options.noOpen : this.nodeOptions.no_open;
         this.m2o_value = this._formatValue(this.value);
         // 'recordParams' is a dict of params used when calling functions
         // 'getDomain' and 'getContext' on this.record
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 261a45f46f5..3651bd25d4e 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -818,7 +818,7 @@
                 t-att-id="widget.idForLabel"/>
             <a role="button" class="o_dropdown_button" draggable="false"/>
         </div>
-        <button type="button" t-if="!widget.nodeOptions.no_open" class="fa fa-external-link btn btn-secondary o_external_button" tabindex="-1" draggable="false" aria-label="External link" title="External link"/>
+        <button type="button" t-if="!widget.noOpen" class="fa fa-external-link btn btn-secondary o_external_button" tabindex="-1" draggable="false" aria-label="External link" title="External link"/>
     </div>
 </t>
 <t t-name="FieldReference" t-extend="FieldMany2One">
diff --git a/addons/web/static/tests/fields/relational_fields_tests.js b/addons/web/static/tests/fields/relational_fields_tests.js
index 950a3dcd8fe..bff0781653f 100644
--- a/addons/web/static/tests/fields/relational_fields_tests.js
+++ b/addons/web/static/tests/fields/relational_fields_tests.js
@@ -486,8 +486,8 @@ QUnit.module('relational_fields', {
         form.destroy();
     });
 
-    QUnit.test('many2one readonly fields with option "no_open"', function (assert) {
-        assert.expect(1);
+    QUnit.test('many2one fields with option "no_open"', function (assert) {
+        assert.expect(3);
 
         var form = createView({
             View: FormView,
@@ -503,7 +503,14 @@ QUnit.module('relational_fields', {
             res_id: 1,
         });
 
-        assert.strictEqual(form.$('a.o_form_uri').length, 0, "should not have an anchor");
+        assert.strictEqual(form.$('span.o_field_widget[name=trululu]').length, 1,
+            "should be displayed inside a span (sanity check)");
+        assert.strictEqual(form.$('span.o_form_uri').length, 0, "should not have an anchor");
+
+        form.$buttons.find('.o_form_button_edit').click();
+        assert.strictEqual(form.$('.o_field_widget[name=trululu] .o_external_button').length,
+            0, "should not have the button to open the record");
+
         form.destroy();
     });
 
@@ -750,7 +757,7 @@ QUnit.module('relational_fields', {
     });
 
     QUnit.test('standalone many2one field', function (assert) {
-        assert.expect(3);
+        assert.expect(4);
         var done = assert.async();
 
         var M2O_DELAY = relationalFields.FieldMany2One.prototype.AUTOCOMPLETE_DELAY;
@@ -769,13 +776,7 @@ QUnit.module('relational_fields', {
             relation: 'partner',
             type: 'many2one',
             value: [1, 'first partner'],
-        }], {
-            partner_id: {
-                options: {
-                    no_open: true,
-                },
-            },
-        }).then(function (recordID) {
+        }]).then(function (recordID) {
             var record = model.get(recordID);
             // create a new widget that uses the StandaloneFieldManagerMixin
             var StandaloneWidget = Widget.extend(StandaloneFieldManagerMixin, {
@@ -793,11 +794,9 @@ QUnit.module('relational_fields', {
                 },
             });
 
-            var relField = new relationalFields.FieldMany2One(parent,
-                'partner_id',
-                record,
-                {
-                    mode: 'edit',
+            var relField = new relationalFields.FieldMany2One(parent, 'partner_id', record, {
+                mode: 'edit',
+                noOpen: true,
             });
 
             relField.appendTo(fixture);
@@ -807,7 +806,11 @@ QUnit.module('relational_fields', {
                 var $dropdown = $('input.o_input').autocomplete('widget');
                 $dropdown.find('.o_m2o_dropdown_option:contains(Create)')
                     .first().mouseenter().click();
+
+                assert.strictEqual(relField.$('.o_external_button').length, 0,
+                    "should not have the button to open the record");
                 assert.verifySteps(['name_search', 'name_create']);
+
                 parent.destroy();
                 model.destroy();
                 relationalFields.FieldMany2One.prototype.AUTOCOMPLETE_DELAY = M2O_DELAY;