From 8306463e9cb42a29e3aae5b2ccc20b5df09e5d11 Mon Sep 17 00:00:00 2001
From: jiazhong <jiazhong@ebay.com>
Date: Thu, 11 Dec 2014 19:29:10 +0800
Subject: [PATCH] rm listen 500 in config.js & listener.js

---
 webapp/app/js/config.js                 |  6 ++--
 webapp/app/js/controllers/access.js     | 26 +++++++++++++++
 webapp/app/js/controllers/admin.js      | 56 ++++++++++++++++++++++++++++++++
 webapp/app/js/controllers/cube.js       | 24 ++++++++++++++
 webapp/app/js/controllers/cubeEdit.js   | 37 +++++++++++++++------
 webapp/app/js/controllers/cubes.js      | 57 ++++++++++++++++++++++++++++++++-
 webapp/app/js/controllers/job.js        | 16 +++++++++
 webapp/app/js/controllers/page.js       | 18 +++++++++--
 webapp/app/js/controllers/projects.js   |  8 +++++
 webapp/app/js/controllers/query.js      | 24 ++++++++++++++
 webapp/app/js/controllers/sourceMeta.js |  9 +++++-
 webapp/app/js/listeners.js              |  8 ++---
 webapp/app/js/services/message.js       |  2 +-
 13 files changed, 270 insertions(+), 21 deletions(-)

diff --git a/webapp/app/js/config.js b/webapp/app/js/config.js
index 729a014..9b0da1f 100644
--- a/webapp/app/js/config.js
+++ b/webapp/app/js/config.js
@@ -57,9 +57,9 @@ KylinApp.config(function ($routeProvider, $httpProvider, $locationProvider, $log
                         $rootScope.$broadcast('event:forbidden', response.data.exception);
                     }
 
-                    if (response.status === 500) {
-                        $rootScope.$broadcast('event:error', response.data.exception);
-                    }
+//                    if (response.status === 500) {
+//                        $rootScope.$broadcast('event:error', response.data.exception);
+//                    }
 
                     return $q.reject(response);
                 }
diff --git a/webapp/app/js/controllers/access.js b/webapp/app/js/controllers/access.js
index e097265..a8e7a68 100644
--- a/webapp/app/js/controllers/access.js
+++ b/webapp/app/js/controllers/access.js
@@ -41,6 +41,16 @@ KylinApp.controller('AccessCtrl', function ($scope,AccessService, MessageService
 //                MessageService.sendMsg('User not found!', 'error', {});
                 SweetAlert.swal('Oops...', 'User not found!!', 'error');
             }
+            else{
+                if(e.data&& e.data.exception){
+                    var message =e.data.exception;
+                    var msg = !!(message) ? message : 'Failed to take action.';
+                    SweetAlert.swal('Oops...', msg, 'error');
+                }else{
+                    SweetAlert.swal('Oops...', "Failed to take action.", 'error');
+                }
+
+            }
         });
     }
 
@@ -53,6 +63,14 @@ KylinApp.controller('AccessCtrl', function ($scope,AccessService, MessageService
             entity.accessEntities = accessEntities;
 //            MessageService.sendMsg('Access granted!', 'success', {});
             SweetAlert.swal('', 'Access granted!', 'success');
+        },function(e){
+            if(e.data&& e.data.exception){
+                var message =e.data.exception;
+                var msg = !!(message) ? message : 'Failed to take action.';
+                SweetAlert.swal('Oops...', msg, 'error');
+            }else{
+                SweetAlert.swal('Oops...', "Failed to take action.", 'error');
+            }
         });
 
     }
@@ -75,6 +93,14 @@ KylinApp.controller('AccessCtrl', function ($scope,AccessService, MessageService
             AccessService.revoke(revokeRequst, function (accessEntities) {
                 entity.accessEntities = accessEntities.accessEntryResponseList;
                 SweetAlert.swal('Success!', 'The access has been revoked.', 'success');
+            },function(e){
+                if(e.data&& e.data.exception){
+                    var message =e.data.exception;
+                    var msg = !!(message) ? message : 'Failed to take action.';
+                    SweetAlert.swal('Oops...', msg, 'error');
+                }else{
+                    SweetAlert.swal('Oops...', "Failed to take action.", 'error');
+                }
             });
 
         });
diff --git a/webapp/app/js/controllers/admin.js b/webapp/app/js/controllers/admin.js
index d44297d..5476a1f 100644
--- a/webapp/app/js/controllers/admin.js
+++ b/webapp/app/js/controllers/admin.js
@@ -9,6 +9,14 @@ KylinApp.controller('AdminCtrl', function ($scope,AdminService, CacheService, Ta
             $scope.envStr = env.env;
             MessageService.sendMsg('Server environment get successfully', 'success', {});
 //            SweetAlert.swal('Success!', 'Server environment get successfully', 'success');
+        },function(e){
+            if(e.data&& e.data.exception){
+                var message =e.data.exception;
+                var msg = !!(message) ? message : 'Failed to take action.';
+                SweetAlert.swal('Oops...', msg, 'error');
+            }else{
+                SweetAlert.swal('Oops...', "Failed to take action.", 'error');
+            }
         });
     }
 
@@ -16,6 +24,14 @@ KylinApp.controller('AdminCtrl', function ($scope,AdminService, CacheService, Ta
         AdminService.config({}, function(config){
             $scope.configStr = config.config;
             MessageService.sendMsg('Server config get successfully', 'success', {});
+        },function(e){
+            if(e.data&& e.data.exception){
+                var message =e.data.exception;
+                var msg = !!(message) ? message : 'Failed to take action.';
+                SweetAlert.swal('Oops...', msg, 'error');
+            }else{
+                SweetAlert.swal('Oops...', "Failed to take action.", 'error');
+            }
         });
     }
 
@@ -32,6 +48,14 @@ KylinApp.controller('AdminCtrl', function ($scope,AdminService, CacheService, Ta
             if(isConfirm){
                 CacheService.clean({}, function () {
                     SweetAlert.swal('Success!', 'Cache reload successfully', 'success');
+                },function(e){
+                    if(e.data&& e.data.exception){
+                        var message =e.data.exception;
+                        var msg = !!(message) ? message : 'Failed to take action.';
+                        SweetAlert.swal('Oops...', msg, 'error');
+                    }else{
+                        SweetAlert.swal('Oops...', "Failed to take action.", 'error');
+                    }
                 });
             }
 
@@ -66,6 +90,14 @@ KylinApp.controller('AdminCtrl', function ($scope,AdminService, CacheService, Ta
             if(isConfirm){
             AdminService.cleanStorage({}, function () {
                 SweetAlert.swal('Success!', 'Storage cleaned successfully!', 'success');
+            },function(e){
+                if(e.data&& e.data.exception){
+                    var message =e.data.exception;
+                    var msg = !!(message) ? message : 'Failed to take action.';
+                    SweetAlert.swal('Oops...', msg, 'error');
+                }else{
+                    SweetAlert.swal('Oops...', "Failed to take action.", 'error');
+                }
             });
             }
         });
@@ -84,6 +116,14 @@ KylinApp.controller('AdminCtrl', function ($scope,AdminService, CacheService, Ta
             if(isConfirm){
             AdminService.updateConfig({}, {key: 'kylin.query.cache.enabled',value:false}, function () {
                 SweetAlert.swal('Success!', 'Cache disabled successfully!', 'success');
+            },function(e){
+                if(e.data&& e.data.exception){
+                    var message =e.data.exception;
+                    var msg = !!(message) ? message : 'Failed to take action.';
+                    SweetAlert.swal('Oops...', msg, 'error');
+                }else{
+                    SweetAlert.swal('Oops...', "Failed to take action.", 'error');
+                }
             });
             }
 
@@ -113,6 +153,14 @@ KylinApp.controller('AdminCtrl', function ($scope,AdminService, CacheService, Ta
             TableService.genCardinality({tableName: $scope.tableName}, {delimiter: $scope.delimiter, format: $scope.format}, function (result) {
 //                MessageService.sendMsg('Cardinality job was calculated successfully. Click Refresh button ...', 'success', {});
                 SweetAlert.swal('Success!', 'Cardinality job was calculated successfully. . Click Refresh button ...', 'success');
+            },function(e){
+                if(e.data&& e.data.exception){
+                    var message =e.data.exception;
+                    var msg = !!(message) ? message : 'Failed to take action.';
+                    SweetAlert.swal('Oops...', msg, 'error');
+                }else{
+                    SweetAlert.swal('Oops...', "Failed to take action.", 'error');
+                }
             });
         }
     };
@@ -140,6 +188,14 @@ KylinApp.controller('AdminCtrl', function ($scope,AdminService, CacheService, Ta
                 AdminService.updateConfig({}, {key: $scope.state.key, value: $scope.state.value}, function (result) {
                     SweetAlert.swal('Success!', 'Config updated successfully!', 'success');
                     $modalInstance.dismiss();
+                },function(e){
+                    if(e.data&& e.data.exception){
+                        var message =e.data.exception;
+                        var msg = !!(message) ? message : 'Failed to take action.';
+                        SweetAlert.swal('Oops...', msg, 'error');
+                    }else{
+                        SweetAlert.swal('Oops...', "Failed to take action.", 'error');
+                    }
                 });
                 }
 
diff --git a/webapp/app/js/controllers/cube.js b/webapp/app/js/controllers/cube.js
index ee62557..51df3be 100644
--- a/webapp/app/js/controllers/cube.js
+++ b/webapp/app/js/controllers/cube.js
@@ -11,6 +11,14 @@ KylinApp.controller('CubeCtrl', function ($scope, AccessService, MessageService,
     $scope.getCubeSql = function (cube) {
         CubeService.getSql({cubeId: cube.name, propValue: "null"}, function (sql) {
             cube.sql = sql.sql;
+        },function(e){
+            if(e.data&& e.data.exception){
+                var message =e.data.exception;
+                var msg = !!(message) ? message : 'Failed to take action.';
+                SweetAlert.swal('Oops...', msg, 'error');
+            }else{
+                SweetAlert.swal('Oops...', "Failed to take action.", 'error');
+            }
         });
     };
 
@@ -44,6 +52,14 @@ KylinApp.controller('CubeCtrl', function ($scope, AccessService, MessageService,
         CubeService.updateNotifyList({cubeId: cube.name}, cube.detail.notify_list, function () {
 //            MessageService.sendMsg('Notify List updated successfully!', 'success', {});
             SweetAlert.swal('Success!', 'Notify List updated successfully!', 'success');
+        },function(e){
+            if(e.data&& e.data.exception){
+                var message =e.data.exception;
+                var msg = !!(message) ? message : 'Failed to take action.';
+                SweetAlert.swal('Oops...', msg, 'error');
+            }else{
+                SweetAlert.swal('Oops...', "Failed to take action.", 'error');
+            }
         });
     };
 
@@ -58,6 +74,14 @@ KylinApp.controller('CubeCtrl', function ($scope, AccessService, MessageService,
                     totalSize += t.tableSize;
                 });
                 cube.totalSize = totalSize;
+            },function(e){
+                if(e.data&& e.data.exception){
+                    var message =e.data.exception;
+                    var msg = !!(message) ? message : 'Failed to take action.';
+                    SweetAlert.swal('Oops...', msg, 'error');
+                }else{
+                    SweetAlert.swal('Oops...', "Failed to take action.", 'error');
+                }
             });
         }
     };
diff --git a/webapp/app/js/controllers/cubeEdit.js b/webapp/app/js/controllers/cubeEdit.js
index 7ce3a3f..56afdaf 100644
--- a/webapp/app/js/controllers/cubeEdit.js
+++ b/webapp/app/js/controllers/cubeEdit.js
@@ -206,18 +206,25 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio
                     CubeService.update({}, {cubeDescData: $scope.state.cubeSchema, cubeName: $routeParams.cubeName, project: $scope.state.project}, function (request) {
                         if (request.successful) {
                             $scope.state.cubeSchema = request.cubeDescData;
-                            SweetAlert.swal('success', "Update cube successful.", 'success');
+                            MessageService.sendMsg("Update cube successful.","success",{},true);
                             if(design_form){
                                 design_form.$invalid = true;
                             }
                         } else {
-                            SweetAlert.swal('Oops...', request.message, 'error');
+                            MessageService.sendMsg("<h2>Failed to deal the request:</h2><pre>"+$scope.state.cubeSchema+"</pre>","error",{},true);
                         }
                         //end loading
                         loadingRequest.hide();
                         recoveryCubeStatus();
-                    }, function () {
-//                            SweetAlert.swal('Oops...', 'Action Failed: ' + msg, 'error');
+                    }, function (e) {
+
+                        if(e.data&& e.data.exception){
+                            var message =e.data.exception;
+                            var msg = !!(message) ? message : 'Failed to take action.';
+                            MessageService.sendMsg("<h2>Failed to deal the request:"+msg+"</h2><pre>"+$scope.state.cubeSchema+"</pre>","error",{},true);
+                        }else{
+                            SweetAlert.swal('Oops...', "Failed to take action.", 'error');
+                        }
                         loadingRequest.hide();
                         recoveryCubeStatus();
                     });
@@ -226,17 +233,29 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio
                     CubeService.save({}, {cubeDescData: $scope.state.cubeSchema, project: $scope.state.project}, function (request) {
                         if (request.successful) {
                             $scope.state.cubeSchema = request.cubeDescData;
-                            SweetAlert.swal('success', "Created cube successful.", 'success');
+                            MessageService.sendMsg("Created cube successful.","success",{},true);
                         } else {
                             $scope.cubeMetaFrame.project = $scope.state.project;
-                            SweetAlert.swal('Oops...', request.message, 'error');
-                        }
+                            var e = request;
+                            if(e.data&& e.data.exception){
+                                var message =e.data.exception;
+                                var msg = !!(message) ? message : 'Failed to take action.';
+                                MessageService.sendMsg("<h2>Failed to deal the request:</h2><p>"+msg+"</p><pre>"+$scope.state.cubeSchema+"</pre>","error",{},true);
+                            }else{
+                                SweetAlert.swal('Oops...', "Failed to take action.", 'error');
+                            }                        }
 
                         //end loading
                         loadingRequest.hide();
                         recoveryCubeStatus();
-                    }, function () {
-
+                    }, function (e) {
+                        if(e.data&& e.data.exception){
+                            var message =e.data.exception;
+                            var msg = !!(message) ? message : 'Failed to take action.';
+                            MessageService.sendMsg("<h2>Failed to deal the request:</h2><p>"+msg+"</p><pre>"+$scope.state.cubeSchema+"</pre>","error",{},true);
+                        }else{
+                            SweetAlert.swal('Oops...', "Failed to take action.", 'error');
+                        }
                         //end loading
                         loadingRequest.hide();
                         recoveryCubeStatus();
diff --git a/webapp/app/js/controllers/cubes.js b/webapp/app/js/controllers/cubes.js
index 2e2f192..80aa7d8 100644
--- a/webapp/app/js/controllers/cubes.js
+++ b/webapp/app/js/controllers/cubes.js
@@ -93,7 +93,14 @@ KylinApp
                     if (detail.length > 0) {
                         cube.detail = detail[0];
                     }
-                }, function () {
+                }, function (e) {
+                    if(e.data&& e.data.exception){
+                        var message =e.data.exception;
+                        var msg = !!(message) ? message : 'Failed to take action.';
+                        SweetAlert.swal('Oops...', msg, 'error');
+                    }else{
+                        SweetAlert.swal('Oops...', "Failed to take action.", 'error');
+                    }
                 });
             }
         };
@@ -126,6 +133,14 @@ KylinApp
                     cube.status = 'READY';
 //                    MessageService.sendMsg('Enable job was submitted successfully', 'success', {});
                     SweetAlert.swal('Success!', 'Enable job was submitted successfully', 'success');
+                },function(e){
+                    if(e.data&& e.data.exception){
+                        var message =e.data.exception;
+                        var msg = !!(message) ? message : 'Failed to take action.';
+                        SweetAlert.swal('Oops...', msg, 'error');
+                    }else{
+                        SweetAlert.swal('Oops...', "Failed to take action.", 'error');
+                    }
                 });
                 }
             });
@@ -152,6 +167,14 @@ KylinApp
                     $scope.cubes=[];
                     $scope.reload();
                     SweetAlert.swal('Success!', 'Purge job was submitted successfully', 'success');
+                },function(e){
+                    if(e.data&& e.data.exception){
+                        var message =e.data.exception;
+                        var msg = !!(message) ? message : 'Failed to take action.';
+                        SweetAlert.swal('Oops...', msg, 'error');
+                    }else{
+                        SweetAlert.swal('Oops...', "Failed to take action.", 'error');
+                    }
                 });
                 }
             });
@@ -172,6 +195,14 @@ KylinApp
                 CubeService.disable({cubeId: cube.name}, {}, function (result) {
                     cube.status = 'DISABLED';
                     SweetAlert.swal('Success!', 'Disable job was submitted successfully', 'success');
+                },function(e){
+                    if(e.data&& e.data.exception){
+                        var message =e.data.exception;
+                        var msg = !!(message) ? message : 'Failed to take action.';
+                        SweetAlert.swal('Oops...', msg, 'error');
+                    }else{
+                        SweetAlert.swal('Oops...', "Failed to take action.", 'error');
+                    }
                 });
                 }
 
@@ -197,6 +228,14 @@ KylinApp
                     }
                     SweetAlert.swal('Success!', 'Cube drop is done successfully', 'success');
 
+                },function(e){
+                    if(e.data&& e.data.exception){
+                        var message =e.data.exception;
+                        var msg = !!(message) ? message : 'Failed to take action.';
+                        SweetAlert.swal('Oops...', msg, 'error');
+                    }else{
+                        SweetAlert.swal('Oops...', "Failed to take action.", 'error');
+                    }
                 });
                 }
 
@@ -251,6 +290,14 @@ KylinApp
                                             }
                                         }
                                     });
+                                },function(e){
+                                    if(e.data&& e.data.exception){
+                                        var message =e.data.exception;
+                                        var msg = !!(message) ? message : 'Failed to take action.';
+                                        SweetAlert.swal('Oops...', msg, 'error');
+                                    }else{
+                                        SweetAlert.swal('Oops...', "Failed to take action.", 'error');
+                                    }
                                 });
                             }
 
@@ -337,6 +384,14 @@ var jobSubmitCtrl = function ($scope, $modalInstance, CubeService, MessageServic
                             }
                         }
                     });
+                },function(e){
+                    if(e.data&& e.data.exception){
+                        var message =e.data.exception;
+                        var msg = !!(message) ? message : 'Failed to take action.';
+                        SweetAlert.swal('Oops...', msg, 'error');
+                    }else{
+                        SweetAlert.swal('Oops...', "Failed to take action.", 'error');
+                    }
                 });
             }
 
diff --git a/webapp/app/js/controllers/job.js b/webapp/app/js/controllers/job.js
index 7bf14ce..9324eb2 100644
--- a/webapp/app/js/controllers/job.js
+++ b/webapp/app/js/controllers/job.js
@@ -118,6 +118,14 @@ KylinApp
                     }
 //                    MessageService.sendMsg('Job was resumed successfully', 'success', {});
                     SweetAlert.swal('Success!', 'Job has been resumed successfully!', 'success');
+                },function(e){
+                    if(e.data&& e.data.exception){
+                        var message =e.data.exception;
+                        var msg = !!(message) ? message : 'Failed to take action.';
+                        SweetAlert.swal('Oops...', msg, 'error');
+                    }else{
+                        SweetAlert.swal('Oops...', "Failed to take action.", 'error');
+                    }
                 });
             });
         }
@@ -138,6 +146,14 @@ KylinApp
                         $scope.state.selectedJob = $scope.jobs[ $scope.state.selectedJob.uuid];
                     }
                     SweetAlert.swal('Success!', 'Job has been discarded successfully!', 'success');
+                },function(e){
+                    if(e.data&& e.data.exception){
+                        var message =e.data.exception;
+                        var msg = !!(message) ? message : 'Failed to take action.';
+                        SweetAlert.swal('Oops...', msg, 'error');
+                    }else{
+                        SweetAlert.swal('Oops...', "Failed to take action.", 'error');
+                    }
                 });
             });
         }
diff --git a/webapp/app/js/controllers/page.js b/webapp/app/js/controllers/page.js
index 31f5bc7..1b0684d 100644
--- a/webapp/app/js/controllers/page.js
+++ b/webapp/app/js/controllers/page.js
@@ -178,6 +178,14 @@ var projCtrl = function ($scope, $modalInstance, ProjectService, MessageService,
             ProjectService.update({}, requestBody, function (newProj) {
                 SweetAlert.swal('Success!', 'Project update successfully!', 'success');
                 $modalInstance.dismiss('cancel');
+            },function(e){
+                if(e.data&& e.data.exception){
+                    var message =e.data.exception;
+                    var msg = !!(message) ? message : 'Failed to take action.';
+                    SweetAlert.swal('Oops...', msg, 'error');
+                }else{
+                    SweetAlert.swal('Oops...', "Failed to take action.", 'error');
+                }
             });
         }
         else
@@ -188,8 +196,14 @@ var projCtrl = function ($scope, $modalInstance, ProjectService, MessageService,
                 if(projects) {
                     projects.push(newProj);
                 }
-            }, function(){
-                console.log('error');
+            }, function(e){
+                if(e.data&& e.data.exception){
+                    var message =e.data.exception;
+                    var msg = !!(message) ? message : 'Failed to take action.';
+                    SweetAlert.swal('Oops...', msg, 'error');
+                }else{
+                    SweetAlert.swal('Oops...', "Failed to take action.", 'error');
+                }
             });
         }
     };
diff --git a/webapp/app/js/controllers/projects.js b/webapp/app/js/controllers/projects.js
index 69911e0..4f5a375 100644
--- a/webapp/app/js/controllers/projects.js
+++ b/webapp/app/js/controllers/projects.js
@@ -64,6 +64,14 @@ KylinApp
                         $scope.projects.splice(pIndex, 1);
                     }
                 SweetAlert.swal('Success!',"Project [" + project.name + "] has been deleted successfully!", 'success');
+                },function(e){
+                    if(e.data&& e.data.exception){
+                        var message =e.data.exception;
+                        var msg = !!(message) ? message : 'Failed to take action.';
+                        SweetAlert.swal('Oops...', msg, 'error');
+                    }else{
+                        SweetAlert.swal('Oops...', "Failed to take action.", 'error');
+                    }
                 });
                 }
             });
diff --git a/webapp/app/js/controllers/query.js b/webapp/app/js/controllers/query.js
index b97f2ab..1d5643c 100644
--- a/webapp/app/js/controllers/query.js
+++ b/webapp/app/js/controllers/query.js
@@ -222,6 +222,14 @@ KylinApp
                 $scope.parseQueryResult(query, result, (!result || result.isException) ? 'failed' : 'success');
                 $scope.curQuery.result.hasMore = (query.result.results && query.result.results.length == $scope.rowsPerPage);
             }, function (result) {
+                var e = result;
+                if(e.data&& e.data.exception){
+                    var message =e.data.exception;
+                    var msg = !!(message) ? message : 'Failed to take action.';
+                    SweetAlert.swal('Oops...', msg, 'error');
+                }else{
+                    SweetAlert.swal('Oops...', "Failed to take action.", 'error');
+                }
                 scrollToButton();
                 $scope.parseQueryResult(query, result, 'failed');
             });
@@ -279,6 +287,14 @@ KylinApp
                 query.result.loading = false;
             }, function (result) {
                 query.status = 'failed';
+                var e = result;
+                if(e.data&& e.data.exception){
+                    var message =e.data.exception;
+                    var msg = !!(message) ? message : 'Failed to take action.';
+                    SweetAlert.swal('Oops...', msg, 'error');
+                }else{
+                    SweetAlert.swal('Oops...', "Failed to take action.", 'error');
+                }
             });
         }
 
@@ -361,6 +377,14 @@ KylinApp
                 QueryService.save({}, {name: query.name, project: query.project, sql: query.sql, description: query.description}, function () {
                     SweetAlert.swal('Success!', 'New query saved..', 'success');
                     $modalInstance.dismiss('cancel');
+                },function(e){
+                    if(e.data&& e.data.exception){
+                        var message =e.data.exception;
+                        var msg = !!(message) ? message : 'Failed to take action.';
+                        SweetAlert.swal('Oops...', msg, 'error');
+                    }else{
+                        SweetAlert.swal('Oops...', "Failed to take action.", 'error');
+                    }
                 });
             }
         }
diff --git a/webapp/app/js/controllers/sourceMeta.js b/webapp/app/js/controllers/sourceMeta.js
index fce905e..2f1ea4c 100644
--- a/webapp/app/js/controllers/sourceMeta.js
+++ b/webapp/app/js/controllers/sourceMeta.js
@@ -184,7 +184,14 @@ KylinApp
 
                     loadingRequest.hide();
                     hiveTbLoad.status="success";
-                },function(){
+                },function(e){
+                    if(e.data&& e.data.exception){
+                        var message =e.data.exception;
+                        var msg = !!(message) ? message : 'Failed to take action.';
+                        SweetAlert.swal('Oops...', msg, 'error');
+                    }else{
+                        SweetAlert.swal('Oops...', "Failed to take action.", 'error');
+                    }
                     loadingRequest.hide();
                     hiveTbLoad.status="init";
                 })
diff --git a/webapp/app/js/listeners.js b/webapp/app/js/listeners.js
index 3630991..23fbf1a 100644
--- a/webapp/app/js/listeners.js
+++ b/webapp/app/js/listeners.js
@@ -77,8 +77,8 @@ KylinApp.run(function ($rootScope,$http, $location, UserService, AuthenticationS
     /**
      * On 'event:error', resend all the 500 requests.
      */
-    $rootScope.$on('event:error', function (event, message) {
-        var msg = !!(message) ? message : 'Failed to take action.';
-        SweetAlert.swal('Oops...', 'Action Failed: ' + msg, 'error');
-    });
+//    $rootScope.$on('event:error', function (event, message) {
+//        var msg = !!(message) ? message : 'Failed to take action.';
+//        SweetAlert.swal('Oops...', 'Action Failed: ' + msg, 'error');
+//    });
 });
\ No newline at end of file
diff --git a/webapp/app/js/services/message.js b/webapp/app/js/services/message.js
index 70519fc..3152dd9 100644
--- a/webapp/app/js/services/message.js
+++ b/webapp/app/js/services/message.js
@@ -1,6 +1,6 @@
 KylinApp.service('MessageService', function () {
     var options = {
-        extraClasses: 'messenger-fixed messenger-on-top messenger-on-right',
+        extraClasses: 'messenger-fixed messenger-on-top',
         theme: 'air'
     };