From 809dbef78988ab4ceb59cb0da30b6e65d38543ac Mon Sep 17 00:00:00 2001
From: Sergi Almacellas Abellana <sergi@koolpi.com>
Date: Thu, 27 Apr 2017 10:26:42 +0200
Subject: [PATCH] Don't show warning dialog message as dialog title

issue6369
review30161002
---
 src/common.js | 15 ++++++++++-----
 src/rpc.js    |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/common.js b/src/common.js
index 56a7e118d8..9608c2bdf9 100644
--- a/src/common.js
+++ b/src/common.js
@@ -2678,8 +2678,7 @@
         build_dialog: function(message, title, prm) {
             var dialog = Sao.common.WarningDialog._super.build_dialog.call(
                 this);
-            dialog.add_title(title);
-            dialog.body.append(jQuery('<div/>', {
+            var content = jQuery('<div/>', {
                 'class': 'alert alert-warning',
                 role: 'alert'
             }).append(jQuery('<span/>', {
@@ -2688,9 +2687,15 @@
             })).append(jQuery('<span/>', {
                 'class': 'sr-only'
             }).append(Sao.i18n.gettext('Warning: '))
-            ).append(jQuery('<span/>')
-                .append(message)
-                .css('white-space', 'pre-wrap')));
+            ).append(jQuery('<h4/>')
+                .append(title)
+                .css('white-space', 'pre-wrap'));
+            if (message) {
+                content.append(jQuery('<span/>')
+                    .append(message)
+                    .css('white-space', 'pre-wrap'));
+            }
+            dialog.body.append(content);
             jQuery('<button/>', {
                 'class': 'btn btn-primary',
                 'type': 'button'
diff --git a/src/rpc.js b/src/rpc.js
index 69a2e0e3e3..b7bb019bb8 100644
--- a/src/rpc.js
+++ b/src/rpc.js
@@ -63,7 +63,7 @@
                 } else if (data.error[0] == 'UserError') {
                     msg = data.error[1][0];
                     description = data.error[1][1];
-                    Sao.common.warning.run(msg, description)
+                    Sao.common.warning.run(description, msg)
                         .always(dfd.reject);
                     return;
                 } else if (data.error[0] == 'ConcurrencyException') {