From 2e35a7e46f0929438c1c206e3116caa829f07dc6 Mon Sep 17 00:00:00 2001
From: Thomas Duval <thomas.duval@orange.com>
Date: Fri, 5 Oct 2018 16:54:37 +0200
Subject: Update code to 4.6 official version

Change-Id: Ibd0da0e476e24b2685f54693efc11f7a58d40a62
---
 moon_dashboard/moon/static/moon/js/moon.module.js  | 2 +-
 moon_dashboard/moon/static/moon/js/util.service.js | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'moon_dashboard/moon/static/moon/js')

diff --git a/moon_dashboard/moon/static/moon/js/moon.module.js b/moon_dashboard/moon/static/moon/js/moon.module.js
index ed56ec2a..c8b86439 100755
--- a/moon_dashboard/moon/static/moon/js/moon.module.js
+++ b/moon_dashboard/moon/static/moon/js/moon.module.js
@@ -23,7 +23,7 @@
 		.module('moon', [
 			'ngResource',
 		]).constant('moon.URI', {
-			API: 'http://{{MANAGER_HOST}}:{{MANAGER_PORT}}',
+			API: 'http://{{MANAGER_HOST}}:{{MANAGER_PORT}}', 
 		})
 
 })();
diff --git a/moon_dashboard/moon/static/moon/js/util.service.js b/moon_dashboard/moon/static/moon/js/util.service.js
index 18ae901d..29680a43 100755
--- a/moon_dashboard/moon/static/moon/js/util.service.js
+++ b/moon_dashboard/moon/static/moon/js/util.service.js
@@ -117,8 +117,12 @@
             },
 
             displayErrorFunction: function displayErrorFunction(message) {
-                return function() {
-                    toast.add('error', gettext(message));
+                return function(response) {
+                    var text = gettext(message);
+                    if (response && response.data && response.data.message) {
+                        text += ' (' + response.data.message + ')'
+                    }
+                    toast.add('error', text);
                 }
             },
     
-- 
cgit 1.2.3-korg