kylin git commit: KYLIN-2990 Add warning window of exist model names for other project selected

[shaofengshi]

Repository: kylin
Updated Branches:
  refs/heads/master ca5b3b76f -> 82fc92f21


KYLIN-2990 Add warning window of exist model names for other project selected

Signed-off-by: shaofengshi <shaofeng...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/82fc92f2
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/82fc92f2
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/82fc92f2

Branch: refs/heads/master
Commit: 82fc92f216ba1ffe848007a4d64ea43882232795
Parents: ca5b3b7
Author: peng.jianhua <peng.jian...@zte.com.cn>
Authored: Fri Nov 3 12:09:29 2017 +0800
Committer: shaofengshi <shaofeng...@apache.org>
Committed: Sat Nov 4 19:59:17 2017 +0800

----------------------------------------------------------------------
 .../src/main/java/org/apache/kylin/rest/msg/CnMessage.java      | 3 ---
 .../src/main/java/org/apache/kylin/rest/msg/Message.java        | 3 ---
 .../main/java/org/apache/kylin/rest/service/ModelService.java   | 5 -----
 webapp/app/js/controllers/modelSchema.js                        | 4 +---
 4 files changed, 1 insertion(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/82fc92f2/server-base/src/main/java/org/apache/kylin/rest/msg/CnMessage.java
----------------------------------------------------------------------
diff --git a/server-base/src/main/java/org/apache/kylin/rest/msg/CnMessage.java 
b/server-base/src/main/java/org/apache/kylin/rest/msg/CnMessage.java
index 2b1bf8e..a686ab5 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/msg/CnMessage.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/msg/CnMessage.java
@@ -178,9 +178,6 @@ public class CnMessage extends Message {
         return "非法模型名称 '%s', 仅支持字母, 数字和下划线";
     }
 
-    public String getDUPLICATE_MODEL_NAME() {
-        return "模型名称 '%s' 已存在, 不能被创建";
-    }
 
     public String getDROP_REFERENCED_MODEL() {
         return "模型被 Cube '%s' 引用, 不能被删除";

http://git-wip-us.apache.org/repos/asf/kylin/blob/82fc92f2/server-base/src/main/java/org/apache/kylin/rest/msg/Message.java
----------------------------------------------------------------------
diff --git a/server-base/src/main/java/org/apache/kylin/rest/msg/Message.java 
b/server-base/src/main/java/org/apache/kylin/rest/msg/Message.java
index 146a0a5..a881c86 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/msg/Message.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/msg/Message.java
@@ -178,9 +178,6 @@ public class Message {
         return "Invalid Model name '%s', only letters, numbers and underline 
supported.";
     }
 
-    public String getDUPLICATE_MODEL_NAME() {
-        return "Model name '%s' is duplicated, could not be created.";
-    }
 
     public String getDROP_REFERENCED_MODEL() {
         return "Model is referenced by Cube '%s' , could not dropped";

http://git-wip-us.apache.org/repos/asf/kylin/blob/82fc92f2/server-base/src/main/java/org/apache/kylin/rest/service/ModelService.java
----------------------------------------------------------------------
diff --git 
a/server-base/src/main/java/org/apache/kylin/rest/service/ModelService.java 
b/server-base/src/main/java/org/apache/kylin/rest/service/ModelService.java
index b099396..17a9a8c 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/service/ModelService.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/service/ModelService.java
@@ -132,11 +132,6 @@ public class ModelService extends BasicService {
 
     public DataModelDesc createModelDesc(String projectName, DataModelDesc 
desc) throws IOException {
         
aclEvaluate.hasProjectWritePermission(getProjectManager().getProject(projectName));
-        Message msg = MsgPicker.getMsg();
-
-        if (getDataModelManager().getDataModelDesc(desc.getName()) != null) {
-            throw new 
BadRequestException(String.format(msg.getDUPLICATE_MODEL_NAME(), 
desc.getName()));
-        }
         DataModelDesc createdDesc = null;
         String owner = 
SecurityContextHolder.getContext().getAuthentication().getName();
         createdDesc = getDataModelManager().createDataModelDesc(desc, 
projectName, owner);

http://git-wip-us.apache.org/repos/asf/kylin/blob/82fc92f2/webapp/app/js/controllers/modelSchema.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/modelSchema.js 
b/webapp/app/js/controllers/modelSchema.js
index 41a26bb..74fd0f7 100644
--- a/webapp/app/js/controllers/modelSchema.js
+++ b/webapp/app/js/controllers/modelSchema.js
@@ -62,12 +62,10 @@ KylinApp.controller('ModelSchemaCtrl', function ($scope, 
QueryService, UserServi
   //init modelsManager
   if ($scope.state.mode == "edit") {
     var defer = $q.defer();
-    var queryParam = {};
     if (!$scope.projectModel.isSelectedProjectValid()) {
       return;
     }
-    queryParam.projectName = $scope.projectModel.selectedProject;
-    modelsManager.list(queryParam).then(function (resp) {
+    modelsManager.list().then(function (resp) {
       defer.resolve(resp);
       modelsManager.loading = false;
       return defer.promise;