From 843f23b3974e9b2caf78c0f224a18c155e558135 Mon Sep 17 00:00:00 2001
From: "peng.jianhua" <peng.jianhua@zte.com.cn>
Date: Fri, 3 Nov 2017 12:09:29 +0800
Subject: [PATCH 1/1] KYLIN-2990 Add warning window of exist model names for
 other project selected

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

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 2b1bf8ec1..a686ab5a8 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' 引用, 不能被删除";
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 146a0a51a..a881c8639 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";
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 b09939669..17a9a8c3f 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);
diff --git a/webapp/app/js/controllers/modelSchema.js b/webapp/app/js/controllers/modelSchema.js
index 41a26bb55..74fd0f71d 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;
-- 
2.11.0.windows.1