Repository: kylin Updated Branches: refs/heads/v1.6.0-rc1 d273d6b84 -> 0b2c7556a
KYLIN-2126 use column name as default dimension name when auto generate dimension for lookup table Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/0b2c7556 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/0b2c7556 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/0b2c7556 Branch: refs/heads/v1.6.0-rc1 Commit: 0b2c7556ae14b3a7128302de5198fba069d89951 Parents: d273d6b Author: Jason <jiat...@163.com> Authored: Tue Oct 25 21:00:01 2016 +0800 Committer: Jason <jiat...@163.com> Committed: Tue Oct 25 21:00:56 2016 +0800 ---------------------------------------------------------------------- webapp/app/js/controllers/cubeDimensions.js | 6 +++--- webapp/app/partials/cubeDesigner/dimensions.html | 14 +------------- 2 files changed, 4 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/0b2c7556/webapp/app/js/controllers/cubeDimensions.js ---------------------------------------------------------------------- diff --git a/webapp/app/js/controllers/cubeDimensions.js b/webapp/app/js/controllers/cubeDimensions.js index 5525fe4..ba71c96 100644 --- a/webapp/app/js/controllers/cubeDimensions.js +++ b/webapp/app/js/controllers/cubeDimensions.js @@ -96,7 +96,7 @@ KylinApp.controller('CubeDimensionsCtrl', function ($scope, $modal,MetaModel,cub cols2[k].isLookup = true; // Default not selected and not disabled. - lookupSelectAvailable[cols2[k].name] = {name:cols2[k].table+"_derived",selected: false, disabled: false}; + lookupSelectAvailable[cols2[k].name] = {name:cols2[k].name,selected: false, disabled: false}; } $scope.availableColumns[lookups[j].table] = cols2; @@ -302,7 +302,7 @@ KylinApp.controller('CubeDimensionsCtrl', function ($scope, $modal,MetaModel,cub if(dim.table==$scope.metaModel.model.fact_table){ $scope.selectedColumns[dim.table][colName] = {name:colName,selected: false, disabled: false}; }else{ - $scope.selectedColumns[dim.table][colName] = {name:dim.table+"_derived",selected: false, disabled: false}; + $scope.selectedColumns[dim.table][colName] = {name:colName,selected: false, disabled: false}; } }); }; @@ -400,7 +400,7 @@ KylinApp.controller('CubeDimensionsCtrl', function ($scope, $modal,MetaModel,cub if(table==$scope.metaModel.model.fact_table){ $scope.selectedColumns[table][name].name=name; }else{ - $scope.selectedColumns[table][name].name=table+"_derived"; + $scope.selectedColumns[table][name].name=name; } }else{ if($scope.metaModel.model.fact_table!=table){ http://git-wip-us.apache.org/repos/asf/kylin/blob/0b2c7556/webapp/app/partials/cubeDesigner/dimensions.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/cubeDesigner/dimensions.html b/webapp/app/partials/cubeDesigner/dimensions.html index 3a2efb6..0c4236e 100644 --- a/webapp/app/partials/cubeDesigner/dimensions.html +++ b/webapp/app/partials/cubeDesigner/dimensions.html @@ -276,7 +276,7 @@ </label> </td> <td > - <input type="text" ng-model="selectedColumns[table][col.name].name" placeholder={{table}}_derived ng-disabled="!selectedColumns[table][col.name].selected" style="width:90%;"> + <input type="text" ng-model="selectedColumns[table][col.name].name" ng-disabled="!selectedColumns[table][col.name].selected" style="width:90%;"> </td> <td > {{col.name}} @@ -295,18 +295,6 @@ </div> </div> </div> - - <!--Tips--> - <div class="col-xs-4"> - <div class="box box-solid"> - <div class="box-header"> - <h4 class="box-title"></h4> - </div> - <div class="box-body"> - - </div> - </div> - </div> </div> </div> <div class="modal-footer">
