You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by zh...@apache.org on 2016/11/01 09:34:14 UTC
kylin git commit: KYLIN-1904-WEB-Global-Dictionary bug fix
Repository: kylin
Updated Branches:
refs/heads/v1.6.0-rc1 3f1a495e1 -> c780e43ea
KYLIN-1904-WEB-Global-Dictionary bug fix
Signed-off-by: Jason <ji...@163.com>
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/c780e43e
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/c780e43e
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/c780e43e
Branch: refs/heads/v1.6.0-rc1
Commit: c780e43ea2fa1b35e8d2338dd4a8e37ba3e427c4
Parents: 3f1a495
Author: kangkaisen <ka...@live.com>
Authored: Thu Oct 20 13:31:43 2016 +0800
Committer: Jason <ji...@163.com>
Committed: Tue Nov 1 17:30:33 2016 +0800
----------------------------------------------------------------------
webapp/app/js/controllers/cubeEdit.js | 5 +++--
webapp/app/partials/cubeDesigner/advanced_settings.html | 7 ++++++-
2 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/c780e43e/webapp/app/js/controllers/cubeEdit.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/cubeEdit.js b/webapp/app/js/controllers/cubeEdit.js
index 06d3120..09dae15 100755
--- a/webapp/app/js/controllers/cubeEdit.js
+++ b/webapp/app/js/controllers/cubeEdit.js
@@ -206,8 +206,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);
}
});
http://git-wip-us.apache.org/repos/asf/kylin/blob/c780e43e/webapp/app/partials/cubeDesigner/advanced_settings.html
----------------------------------------------------------------------
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>