KYLIN-919 model name validate when edit model,add lowercase check Signed-off-by: honma <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/83288ac5 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/83288ac5 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/83288ac5 Branch: refs/heads/2.0-rc Commit: 83288ac56c1a60f94ecf1646059fb15353471136 Parents: d03c88b Author: Zhong <[email protected]> Authored: Wed Dec 2 15:02:03 2015 +0800 Committer: honma <[email protected]> Committed: Fri Dec 4 16:26:30 2015 +0800 ---------------------------------------------------------------------- webapp/app/js/controllers/modelSchema.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/83288ac5/webapp/app/js/controllers/modelSchema.js ---------------------------------------------------------------------- diff --git a/webapp/app/js/controllers/modelSchema.js b/webapp/app/js/controllers/modelSchema.js index 9e9f09c..682ce5e 100644 --- a/webapp/app/js/controllers/modelSchema.js +++ b/webapp/app/js/controllers/modelSchema.js @@ -166,9 +166,11 @@ KylinApp.controller('ModelSchemaCtrl', function ($scope, QueryService, UserServi var modelName = $scope.modelsManager.selectedModel.name.toUpperCase(); var models = $scope.modelsManager.modelNameList; - if ($scope.modelMode=="addNewModel"&&models.indexOf(modelName) != -1 || models.indexOf(modelName.toLowerCase()) !=-1) { - SweetAlert.swal('', "Model named [" + modelName + "] already exist!", 'warning'); - return false; + if ($scope.modelMode=="addNewModel") { + if(models.indexOf(modelName) != -1 || models.indexOf(modelName.toLowerCase()) !=-1){ + SweetAlert.swal('', "Model named [" + modelName + "] already exist!", 'warning'); + return false; + } } return true; }
