From 9d1a2ed2b1a576af7015bbe476fdeb09c90a7eee Mon Sep 17 00:00:00 2001
From: "zhixiong.chen" <zhixiong.chen@ChenZhiXiongs-MacBook-Pro.local>
Date: Wed, 12 Jul 2017 20:23:27 +0800
Subject: [PATCH] KYLIN 2544 LOOKUP TABLE SHOW WRONG JOIN TYPE

---
 webapp/app/js/controllers/modelDataModel.js       | 2 +-
 webapp/app/partials/modelDesigner/data_model.html | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/webapp/app/js/controllers/modelDataModel.js b/webapp/app/js/controllers/modelDataModel.js
index c89521889..42c877c79 100644
--- a/webapp/app/js/controllers/modelDataModel.js
+++ b/webapp/app/js/controllers/modelDataModel.js
@@ -43,7 +43,7 @@ KylinApp.controller('ModelDataModelCtrl', function ($location,$scope, $modal,cub
             joinTable:'',
             kind:'LOOKUP',
             join: {
-                type: '',
+                type: 'inner',
                 primary_key: [],
                 foreign_key: [],
                 isCompatible:[],
diff --git a/webapp/app/partials/modelDesigner/data_model.html b/webapp/app/partials/modelDesigner/data_model.html
index b51061a91..5b6b82d05 100644
--- a/webapp/app/partials/modelDesigner/data_model.html
+++ b/webapp/app/partials/modelDesigner/data_model.html
@@ -142,8 +142,8 @@
                         <div class="row">
                           <div class="col-xs-6 form-group">
                               <!--Join Type-->
-                              <select class="chosen-select " style="width:100%;" chosen ng-init="newLookup.join.type='inner'"  ng-model="newLookup.join.type"
-                                            ng-options="joinType.value as joinType.name+'  Join' for joinType in cubeConfig.joinTypes">
+                              <select class="chosen-select " style="width:100%;" chosen  ng-model="newLookup.join.type"
+                                            ng-options="joinType.value as joinType.name+'  Join' for joinType in cubeConfig.joinTypes" >
                                 <option value=""></option>
                               </select>
                           </div>
-- 
2.11.0 (Apple Git-81)