From 584c60f1ba7627230f0db445d167332344f83bfb Mon Sep 17 00:00:00 2001
From: David Monjoie <dmo@odoo.com>
Date: Tue, 13 Jun 2017 09:50:00 +0200
Subject: [PATCH] [FIX] web: display buttons without icon in list view

Previously, the button was completely invisible when no icon
was given, which is a regression from saas-15 where the string
attribute is used to write the button label.
---
 .../static/src/js/views/list/list_renderer.js  |  8 ++++++--
 addons/web/static/tests/views/list_tests.js    | 18 ++++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/views/list/list_renderer.js b/addons/web/static/src/js/views/list/list_renderer.js
index f713ec6e66e..a917781b580 100644
--- a/addons/web/static/src/js/views/list/list_renderer.js
+++ b/addons/web/static/src/js/views/list/list_renderer.js
@@ -271,10 +271,14 @@ var ListRenderer = BasicRenderer.extend({
     _renderButton: function (record, node) {
         var $button = $('<button>', {
             type: 'button',
-            class: 'o_icon_button',
             title: node.attrs.string,
         });
-        $button.append($('<i>', {class: 'fa ' + node.attrs.icon}));
+        if (node.attrs.icon) {
+            $button.addClass('o_icon_button');
+            $button.append($('<i>', {class: 'fa ' + node.attrs.icon}));
+        } else {
+            $button.text(node.attrs.string);
+        }
 
         this._registerModifiers(node, record, $button);
 
diff --git a/addons/web/static/tests/views/list_tests.js b/addons/web/static/tests/views/list_tests.js
index 332ba6687f9..bb38ba453a1 100644
--- a/addons/web/static/tests/views/list_tests.js
+++ b/addons/web/static/tests/views/list_tests.js
@@ -1046,6 +1046,24 @@ QUnit.module('Views', {
         list.destroy();
     });
 
+    QUnit.test('list view with a button without icon', function (assert) {
+        assert.expect(1);
+
+        var list = createView({
+            View: ListView,
+            model: 'foo',
+            data: this.data,
+            arch: '<tree string="Phonecalls" editable="top">' +
+                    '<field name="foo"/>' +
+                    '<button string="abc" type="object" name="schedule_another_phonecall"/>' +
+                '</tree>',
+        });
+
+        assert.strictEqual(list.$('table button').first().text(), 'abc',
+            "should have rendered a button with string attribute as label");
+        list.destroy();
+    });
+
     QUnit.test('list view, editable, can discard', function (assert) {
         assert.expect(5);