[FIX] web,base: m2o empty name results

M2O use the autocomplete lib to display its content. The problem is
that if a result is empty (or only composed of whitespaces), a
divider is displayed in the dropdown.

Commit 1d9f7d279a74aaf6aaf25f91e2313b23b4122827 was fixing this by only displaying non-empty
name results... but it did not work as many models implement the
name_search method the wrong way.

The new solution is to add a default display for record values which
are empty strings, at the right places in the webclient components.

2 files changed, 27 insertions, 31 deletions

diff --git a/addons/web/static/src/js/views/form_common.js b/addons/web/static/src/js/views/form_common.js
index a4bd092dcd1..f869842415c 100644
--- a/addons/web/static/src/js/views/form_common.js
+++ b/addons/web/static/src/js/views/form_common.js
@@ -166,7 +166,7 @@ var ReinitializeFieldMixin =  _.extend({}, ReinitializeWidgetMixin, {
 
 /**
     A mixin containing some useful methods to handle completion inputs.
-    
+
     The widget containing this option can have these arguments in its widget options:
     - no_quick_create: if true, it will disable the quick create
 */
@@ -190,16 +190,15 @@ var CompletionFieldMixin = {
             exclusion_domain.push(['id', 'not in', ids_blacklist]);
         }
 
-        var empty_search = !search_val.trim();
         return this.orderer.add(dataset.name_search(
-                empty_search ? ["", " ", "  ", "   "] : search_val, new data.CompoundDomain(self.build_domain(), exclusion_domain),
-                empty_search ? "not in" : 'ilike', this.limit + 1, self.build_context())).then(function (data) {
-            self.last_search = data;
+                search_val, new data.CompoundDomain(self.build_domain(), exclusion_domain),
+                'ilike', this.limit + 1, self.build_context())).then(function(_data) {
+            self.last_search = _data;
             // possible selections for the m2o
-            var values = _.map(data, function(x) {
+            var values = _.map(_data, function(x) {
                 x[1] = x[1].split("\n")[0];
                 return {
-                    label: _.str.escapeHTML(x[1]),
+                    label: _.str.escapeHTML(x[1].trim()) || data.noDisplayContent,
                     value: x[1],
                     name: x[1],
                     id: x[0],
@@ -212,15 +211,15 @@ var CompletionFieldMixin = {
                 values.push({
                     label: _t("Search More..."),
                     action: function() {
-                        dataset.name_search(search_val, self.build_domain(), 'ilike', 160).done(function(data) {
-                            self._search_create_popup("search", data);
+                        dataset.name_search(search_val, self.build_domain(), 'ilike', 160).done(function(_data) {
+                            self._search_create_popup("search", _data);
                         });
                     },
                     classname: 'o_m2o_dropdown_option'
                 });
             }
             // quick create
-            var raw_result = _(data.result).map(function(x) {return x[1];});
+            var raw_result = _(_data.result).map(function(x) {return x[1];});
             if (search_val.length > 0 && !_.include(raw_result, search_val) &&
                 ! (self.options && (self.options.no_create || self.options.no_quick_create))) {
                 self.can_create && values.push({
@@ -905,7 +904,7 @@ var FormViewDialog = ViewDialog.extend({
         var self = this;
         var _super = this._super.bind(this);
         this.init_dataset();
-        
+
         if (this.res_id) {
             this.dataset.ids = [this.res_id];
             this.dataset.index = 0;
@@ -972,7 +971,7 @@ var SelectCreateDialog = ViewDialog.extend({
         _.defaults(this.options, { initial_view: "search" });
         this.initial_ids = this.options.initial_ids;
     },
-    
+
     open: function() {
         if(this.options.initial_view !== "search") {
             return this.create_edit_record();
@@ -1101,7 +1100,7 @@ var DomainEditorDialog = SelectCreateDialog.extend({
                 get_groupby: function () { return []; },
                 get_domain: function () { return options.default_domain; },
             },
-            values: [{label: _t("Selected domain"), value: null}],            
+            values: [{label: _t("Selected domain"), value: null}],
         }});
 
         this._super(parent, options);
diff --git a/addons/web/static/src/js/views/form_relational_widgets.js b/addons/web/static/src/js/views/form_relational_widgets.js
index 8e64599f470..7acf464ae3c 100644
--- a/addons/web/static/src/js/views/form_relational_widgets.js
+++ b/addons/web/static/src/js/views/form_relational_widgets.js
@@ -177,7 +177,7 @@ var FieldMany2One = common.AbstractField.extend(common.CompletionFieldMixin, com
         this.$input.change(input_changed);
         this.$input.on('click', function() {
             if (self.$input.autocomplete("widget").is(":visible")) {
-                self.$input.autocomplete("close");                
+                self.$input.autocomplete("close");
             } else {
                 if (self.get("value") && ! self.floating) {
                     self.$input.autocomplete("search", "");
@@ -308,7 +308,7 @@ var FieldMany2One = common.AbstractField.extend(common.CompletionFieldMixin, com
     render_value: function(no_recurse) {
         var self = this;
         if (!this.get("value")) {
-            this.display_string("");
+            this.display_string(null);
             return;
         }
         var display = this.display_value["" + this.get("value")];
@@ -336,14 +336,15 @@ var FieldMany2One = common.AbstractField.extend(common.CompletionFieldMixin, com
             }
         }
     },
-    display_string: function(str) {
+    display_string: function (str) {
+        var noValue = (str === null);
         if (!this.get("effective_readonly")) {
-            this.$input.val(str.split("\n")[0]);
+            this.$input.val(noValue ? "" : (str.split("\n")[0].trim() || $(data.noDisplayContent).text()));
             this.current_display = this.$input.val();
             this.$follow_button.toggle(!this.is_false());
             this.$el.toggleClass('o_with_button', !!this.$follow_button && this.$follow_button.length > 0 && !this.is_false());
         } else {
-            this.$el.html(_.escape(str).split("\n").join("<br/>"));
+            this.$el.html(noValue ? "" : (_.escape(str.trim()).split("\n").join("<br/>") || data.noDisplayContent));
             // Define callback to perform when clicking on the field
             if (!this.options.no_open) {
                 // Remove potential previously added event handler
@@ -627,7 +628,7 @@ var AbstractManyField = common.AbstractField.extend({
             add_ids = [],
             command_list = [],
             id, index, record;
-        
+
         _.each(this.get('value'), function (id) {
             index = starting_ids.indexOf(id);
             if (index !== -1) {
@@ -697,7 +698,7 @@ var FieldX2Many = AbstractManyField.extend({
     default_view: 'tree',
     init: function(field_manager, node) {
         this._super(field_manager, node);
-        
+
         this.is_loaded = $.Deferred();
         this.initial_is_loaded = this.is_loaded;
         this.is_started = false;
@@ -1422,19 +1423,15 @@ var FieldMany2ManyTags = AbstractManyField.extend(common.CompletionFieldMixin, c
     },
     render_value: function() {
         var self = this;
-        var values = self.get("value");
-        var handle_names = function(data) {
-            if (self.isDestroyed())
-                return;
-            var indexed = {};
-            _.each(data, function(el) {
-                indexed[el['id']] = el;
+        var values = this.get("value");
+        var handle_names = function(_data) {
+            _.each(_data, function(el) {
+                el.display_name = el.display_name.trim() ? _.str.escapeHTML(el.display_name) : data.noDisplayContent;
             });
-            data = _.map(values, function(el) { return indexed[el]; });
-            self.render_tag(data);
+            self.render_tag(_data);
         };
         if (!values || values.length > 0) {
-            return self.get_render_data(values).done(handle_names);
+            return this.alive(this.get_render_data(values)).done(handle_names);
         } else {
             handle_names([]);
         }
@@ -1493,7 +1490,7 @@ var FieldMany2ManyTags = AbstractManyField.extend(common.CompletionFieldMixin, c
             var old_color = tag.data('color');
             tag.removeClass('o_tag_color_' + old_color);
             tag.data('color', color);
-            tag.addClass('o_tag_color_' + color);            
+            tag.addClass('o_tag_color_' + color);
         });
     },
 });