You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ch...@apache.org on 2018/01/24 06:45:00 UTC
[1/3] kylin git commit: KYLIN-3178 Delete table acl failed will cause
the wabpage awalys shows loading
Repository: kylin
Updated Branches:
refs/heads/master 8547011aa -> 5dbc083e8
KYLIN-3178 Delete table acl failed will cause the wabpage awalys shows loading
Signed-off-by: chenzhx <ch...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/5dbc083e
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/5dbc083e
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/5dbc083e
Branch: refs/heads/master
Commit: 5dbc083e89a3874ad597ab385078f4a2414d9b49
Parents: 4f1f8a5
Author: peng.jianhua <pe...@zte.com.cn>
Authored: Thu Jan 18 14:25:54 2018 +0800
Committer: chenzhx <ch...@apache.org>
Committed: Wed Jan 24 14:44:53 2018 +0800
----------------------------------------------------------------------
webapp/app/js/controllers/acl.js | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/5dbc083e/webapp/app/js/controllers/acl.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/acl.js b/webapp/app/js/controllers/acl.js
index 6f83d21..442e284 100644
--- a/webapp/app/js/controllers/acl.js
+++ b/webapp/app/js/controllers/acl.js
@@ -73,6 +73,15 @@ KylinApp.controller('AclCtrl', function ($scope, AclService, TableModel,loadingR
loadingRequest.hide();
loadTableAclList(type);
SweetAlert.swal('Success!', 'Table acl 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');
+ }
+ loadingRequest.hide();
})
}
})
[2/3] kylin git commit: KYLIN-3183 fix the bug of the 'Remove' button
in 'Query HIstory'
Posted by ch...@apache.org.
KYLIN-3183 fix the bug of the 'Remove' button in 'Query HIstory'
Signed-off-by: chenzhx <ch...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/4f1f8a59
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/4f1f8a59
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/4f1f8a59
Branch: refs/heads/master
Commit: 4f1f8a595eade778bb2c2eb4fb88504a7af003d3
Parents: 6791327
Author: peng.jianhua <pe...@zte.com.cn>
Authored: Fri Jan 19 18:20:24 2018 +0800
Committer: chenzhx <ch...@apache.org>
Committed: Wed Jan 24 14:44:53 2018 +0800
----------------------------------------------------------------------
webapp/app/js/controllers/query.js | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/4f1f8a59/webapp/app/js/controllers/query.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/query.js b/webapp/app/js/controllers/query.js
index cac7ccb..e7190cc 100644
--- a/webapp/app/js/controllers/query.js
+++ b/webapp/app/js/controllers/query.js
@@ -322,6 +322,8 @@ KylinApp
if (queryToRemove) {
var index = $scope.cachedQueries.indexOf(queryToRemove);
$scope.cachedQueries.splice(index, 1);
+ var indexFilter = $scope.cachedFilterQueries.indexOf(queryToRemove);
+ $scope.cachedFilterQueries.splice(indexFilter, 1);
storage.set("saved_queries", $scope.cachedQueries);
}
}
@@ -344,16 +346,16 @@ KylinApp
$scope.listSavedQueries = function () {
QueryService.list({project: $scope.projectModel.selectedProject}, function (queries) {
- $scope.savedQueries = queries
+ $scope.savedQueries = queries;
$scope.savedQueries.curPage = 1;
$scope.savedQueries.perPage = 3;
});
}
$scope.listCachedQueries = function () {
- $scope.cachedQueries = storage.get("saved_queries")
+ $scope.cachedQueries = storage.get("saved_queries");
$scope.cachedFilterQueries = $scope.cachedQueries.filter(function (query) {
- return query.project === $scope.projectModel.selectedProject
+ return query.project === $scope.projectModel.selectedProject;
});
if (!$scope.cachedFilterQueries) {
$scope.cachedFilterQueries = [];
[3/3] kylin git commit: KYLIN-3181 The submit button status of
refreshing cube is not suitable when the start time is equal or more than the
end time.
Posted by ch...@apache.org.
KYLIN-3181 The submit button status of refreshing cube is not suitable when the start time is equal or more than the end time.
Signed-off-by: chenzhx <ch...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/6791327d
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/6791327d
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/6791327d
Branch: refs/heads/master
Commit: 6791327d5a444d0acb2099b3396c30df03ef9396
Parents: 8547011
Author: peng.jianhua <pe...@zte.com.cn>
Authored: Fri Jan 19 11:16:40 2018 +0800
Committer: chenzhx <ch...@apache.org>
Committed: Wed Jan 24 14:44:53 2018 +0800
----------------------------------------------------------------------
webapp/app/partials/jobs/job_refresh.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/6791327d/webapp/app/partials/jobs/job_refresh.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/jobs/job_refresh.html b/webapp/app/partials/jobs/job_refresh.html
index 074406e..83242ae 100644
--- a/webapp/app/partials/jobs/job_refresh.html
+++ b/webapp/app/partials/jobs/job_refresh.html
@@ -88,7 +88,7 @@
<div class="modal-footer">
<button class="btn btn-primary" ng-click="cancel()">Close</button>
- <button class="btn btn-success" ng-click="rebuild()">Submit
+ <button class="btn btn-success" ng-click="rebuild()" ng-disabled="!(jobBuildRequest.startTime >= 0 && jobBuildRequest.endTime > 0 && jobBuildRequest.startTime < jobBuildRequest.endTime)">Submit
</button>
</div>
</script>