From 2c7770d098170e7ff939ed3dd24a55dc6aea8b45 Mon Sep 17 00:00:00 2001
From: kangkaisen <kangkaisen@live.com>
Date: Thu, 20 Oct 2016 13:31:43 +0800
Subject: [PATCH] KYLIN-1904-WEB-Global-Dictionary bug fix

---
 webapp/app/js/controllers/cubeEdit.js                   | 5 +++--
 webapp/app/partials/cubeDesigner/advanced_settings.html | 7 ++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/webapp/app/js/controllers/cubeEdit.js b/webapp/app/js/controllers/cubeEdit.js
index e9bd93e..920cc6e 100755
--- a/webapp/app/js/controllers/cubeEdit.js
+++ b/webapp/app/js/controllers/cubeEdit.js
@@ -192,8 +192,9 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio
       }
 
     });
-    angular.forEach($scope.cubeMetaFrame.measure,function(measure){
-         if(measure.function.parameter.type==column){
+
+    angular.forEach($scope.cubeMetaFrame.measures,function(measure){
+         if(measure.function.parameter.type == "column"){
            me_columns.push(measure.function.parameter.value);
          }
     });
diff --git a/webapp/app/partials/cubeDesigner/advanced_settings.html b/webapp/app/partials/cubeDesigner/advanced_settings.html
index 34fd492..a1e3c80 100755
--- a/webapp/app/partials/cubeDesigner/advanced_settings.html
+++ b/webapp/app/partials/cubeDesigner/advanced_settings.html
@@ -368,7 +368,12 @@
                    <div class="row">
                      <label class="col-xs-12 col-sm-3 control-label no-padding-right font-color-default"><b>Builder Class</b></label>
                      <div class="col-xs-12 col-sm-6">
-                       <input type="text" name="builder"  ng-model="newDictionaries.builder" required  style="width:100% " />
+                       <select class="form-control" chosen
+                               ng-model="newDictionaries.builder"
+                               required>
+                         <option value="org.apache.kylin.dict.GlobalDictionaryBuilder">Global Dictionary</option>
+                         <option value="">-- Select a builder class--</option>
+                       </select>
                      </div>
                    </div>
                  </div>
-- 
2.8.4 (Apple Git-73)