This is an automated email from the ASF dual-hosted git repository. nic pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/kylin.git
The following commit(s) were added to refs/heads/master by this push: new ac27da7 KYLIN-4173 cube list search can not work ac27da7 is described below commit ac27da78c9e94d773367ba6a5c7ec80c2df60a80 Author: luguosheng1314 <550175...@qq.com> AuthorDate: Thu Sep 19 19:48:30 2019 +0800 KYLIN-4173 cube list search can not work --- .../main/java/org/apache/kylin/rest/controller/CubeController.java | 4 ++-- webapp/app/js/controllers/cubeSchema.js | 2 +- webapp/app/js/controllers/cubes.js | 2 +- webapp/app/js/services/cubes.js | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server-base/src/main/java/org/apache/kylin/rest/controller/CubeController.java b/server-base/src/main/java/org/apache/kylin/rest/controller/CubeController.java index 734af4b..8e44ca1 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/controller/CubeController.java +++ b/server-base/src/main/java/org/apache/kylin/rest/controller/CubeController.java @@ -131,9 +131,9 @@ public class CubeController extends BasicController { @Autowired private AclEvaluate aclEvaluate; - @RequestMapping(value = "/validate/{cubeName}", method = RequestMethod.GET, produces = { "application/json" }) + @RequestMapping(value = "{cubeName}/validate", method = RequestMethod.GET, produces = { "application/json" }) @ResponseBody - public EnvelopeResponse<Boolean> validateModelName(@PathVariable String cubeName) { + public EnvelopeResponse<Boolean> validateCubeName(@PathVariable String cubeName) { return new EnvelopeResponse<>(ResponseCode.CODE_SUCCESS, cubeService.isCubeNameVaildate(cubeName), ""); } diff --git a/webapp/app/js/controllers/cubeSchema.js b/webapp/app/js/controllers/cubeSchema.js index 3480ffa..b9f7862 100755 --- a/webapp/app/js/controllers/cubeSchema.js +++ b/webapp/app/js/controllers/cubeSchema.js @@ -321,7 +321,7 @@ KylinApp.controller('CubeSchemaCtrl', function ($scope, QueryService, UserServic var defer = $q.defer(); if ($scope.state.mode === "edit" && $scope.cubeMode === "addNewCube") { var cubeName = $scope.cubeMetaFrame.name; - CubeService.checkDuplicateCubeName({cubeName: cubeName}, {}, function (res) { + CubeService.checkDuplicateCubeName({cubeId: cubeName}, {}, function (res) { if (!res.data) { SweetAlert.swal('Oops...', "The cube named [" + cubeName.toUpperCase() + "] already exists", 'warning'); } diff --git a/webapp/app/js/controllers/cubes.js b/webapp/app/js/controllers/cubes.js index 5038937..69d17be 100644 --- a/webapp/app/js/controllers/cubes.js +++ b/webapp/app/js/controllers/cubes.js @@ -42,7 +42,7 @@ KylinApp.controller('CubesCtrl', function ($scope, $q, $routeParams, $location, $scope.refreshCube = function(cube){ var queryParam = { - cubeName: cube.name + cubeId: cube.name }; var defer = $q.defer(); CubeService.getCube(queryParam, function(newCube){ diff --git a/webapp/app/js/services/cubes.js b/webapp/app/js/services/cubes.js index fe28772..52cb8fe 100644 --- a/webapp/app/js/services/cubes.js +++ b/webapp/app/js/services/cubes.js @@ -36,7 +36,7 @@ KylinApp.factory('CubeService', ['$resource', function ($resource, config) { iterator(data.root, data.root.row_count); return cuboids; }; - return $resource(Config.service.url + 'cubes/:cubeId/:propName/:propValue/:action/:cubeName', {}, { + return $resource(Config.service.url + 'cubes/:cubeId/:propName/:propValue/:action', {}, { list: {method: 'GET', params: {}, isArray: true}, getValidEncodings: {method: 'GET', params: {action:"validEncodings"}, isArray: false}, getCube: {method: 'GET', params: {}, isArray: false},