You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by lu...@apache.org on 2015/08/14 05:21:18 UTC
[13/50] [abbrv] incubator-kylin git commit: KYLIN-938,
add friendly tip to page when rest request failed
KYLIN-938, add friendly tip to page when rest request failed
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/f2c45689
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/f2c45689
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/f2c45689
Branch: refs/heads/0.7
Commit: f2c456890cd14d058e9f87d1834d8861c0a4c2b8
Parents: 86ddd25
Author: jiazhong <ji...@ebay.com>
Authored: Fri Aug 7 15:55:31 2015 +0800
Committer: jiazhong <ji...@ebay.com>
Committed: Fri Aug 7 15:55:31 2015 +0800
----------------------------------------------------------------------
webapp/app/js/controllers/cubeSchema.js | 4 +++-
webapp/app/js/controllers/cubes.js | 5 +++++
webapp/app/js/controllers/job.js | 7 +++++++
webapp/app/js/controllers/sourceMeta.js | 2 ++
webapp/app/js/model/tableModel.js | 2 ++
5 files changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/f2c45689/webapp/app/js/controllers/cubeSchema.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/cubeSchema.js b/webapp/app/js/controllers/cubeSchema.js
index 388edaa..b7aae59 100755
--- a/webapp/app/js/controllers/cubeSchema.js
+++ b/webapp/app/js/controllers/cubeSchema.js
@@ -18,7 +18,7 @@
'use strict';
-KylinApp.controller('CubeSchemaCtrl', function ($scope, QueryService, UserService, ProjectService, AuthenticationService, $filter, ModelService, MetaModel, CubeDescModel, CubeList, TableModel, ProjectModel) {
+KylinApp.controller('CubeSchemaCtrl', function ($scope, QueryService, UserService, ProjectService, AuthenticationService, $filter, ModelService, MetaModel, CubeDescModel, CubeList, TableModel, ProjectModel,SweetAlert) {
$scope.projects = [];
$scope.newDimension = null;
@@ -67,6 +67,8 @@ KylinApp.controller('CubeSchemaCtrl', function ($scope, QueryService, UserServic
if (model) {
$scope.metaModel.model = model;
}
+ },function(resp){
+ SweetAlert.swal('Oops...', "Failed to load model info, please check system log for details.", 'error');
});
}
});
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/f2c45689/webapp/app/js/controllers/cubes.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/cubes.js b/webapp/app/js/controllers/cubes.js
index 75bd7cf..b5d31d0 100755
--- a/webapp/app/js/controllers/cubes.js
+++ b/webapp/app/js/controllers/cubes.js
@@ -62,6 +62,11 @@ KylinApp
$scope.loading = false;
defer.resolve(resp);
return defer.promise;
+ },function(resp){
+ $scope.loading = false;
+ defer.resolve([]);
+ SweetAlert.swal('Oops...', resp, 'error');
+ return defer.promise;
});
};
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/f2c45689/webapp/app/js/controllers/job.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/job.js b/webapp/app/js/controllers/job.js
index 1efab2a..79913e1 100644
--- a/webapp/app/js/controllers/job.js
+++ b/webapp/app/js/controllers/job.js
@@ -85,6 +85,11 @@ KylinApp
$scope.state.loading = false;
defer.resolve(resp);
return defer.promise;
+ },function(resp){
+ $scope.state.loading = false;
+ defer.resolve([]);
+ SweetAlert.swal('Oops...', resp, 'error');
+ return defer.promise;
});
}
@@ -187,6 +192,8 @@ KylinApp
tjob.steps[stepId].cmd_output = result['cmd_output'];
tjob.steps[stepId].loadingOp = false;
}
+ },function(e){
+ SweetAlert.swal('Oops...',"Failed to load job info, please check system log for details.", 'error');
});
} else {
internalOpenModal();
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/f2c45689/webapp/app/js/controllers/sourceMeta.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/sourceMeta.js b/webapp/app/js/controllers/sourceMeta.js
index 74c897e..85307f8 100755
--- a/webapp/app/js/controllers/sourceMeta.js
+++ b/webapp/app/js/controllers/sourceMeta.js
@@ -49,6 +49,8 @@ KylinApp
$scope.loading = true;
TableModel.aceSrcTbLoaded(forceLoad).then(function () {
$scope.loading = false;
+ },function(resp){
+ SweetAlert.swal('Oops...',resp, 'error');
});
};
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/f2c45689/webapp/app/js/model/tableModel.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/model/tableModel.js b/webapp/app/js/model/tableModel.js
index 18967bb..ca9c47c 100755
--- a/webapp/app/js/model/tableModel.js
+++ b/webapp/app/js/model/tableModel.js
@@ -108,6 +108,8 @@ KylinApp.service('TableModel', function (ProjectModel, $q, TableService) {
});
}
defer.resolve();
+ },function(e){
+ defer.reject("Failed to load tables, please check system log for details.");
});
return defer.promise;