ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject ignite git commit: IGNITE-843 Fixed error message from serevr.
Date Wed, 16 Sep 2015 03:42:46 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843 2f1401efd -> 7f57f7c90


IGNITE-843 Fixed error message from serevr.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7f57f7c9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7f57f7c9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7f57f7c9

Branch: refs/heads/ignite-843
Commit: 7f57f7c9054b7b461f26202156fb4656b7bd2993
Parents: 2f1401e
Author: Alexey Kuznetsov <akuznetsov@apache.org>
Authored: Wed Sep 16 10:42:37 2015 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Wed Sep 16 10:42:37 2015 +0700

----------------------------------------------------------------------
 .../src/main/js/controllers/common-module.js                | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/7f57f7c9/modules/control-center-web/src/main/js/controllers/common-module.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js
index 5dbd31f..f88089b 100644
--- a/modules/control-center-web/src/main/js/controllers/common-module.js
+++ b/modules/control-center-web/src/main/js/controllers/common-module.js
@@ -105,7 +105,14 @@ controlCenterModule.service('$common', [
         var msgModal = undefined;
 
         function errorMessage(errMsg) {
-            return errMsg ? errMsg : 'Internal server error.';
+            if (errMsg) {
+                if (errMsg.hasOwnProperty('message'))
+                    return errMsg.message;
+
+                return errMsg;
+            }
+
+            return 'Internal server error.';
         }
 
         function showError(msg, placement, container) {


Mime
View raw message